On 01/04/2011 10:20 AM, Curtis Olson wrote:
> I'm in a situation now where I have local
> mods that "git diff" does not report and I'm not sure how to deal with that.
> How can I find the differences between my local repository and the master
> ... especially those changes that I haven't committed or pushed yet?
1) Try this:
git stash pop
It should undo the effect of the previous git stash. See below for
more on this.
2) I generally don't bother with git stash.
3) Constructive suggestion: Never edit stuff on a branch that is tracking
a remote. As a common example, if the local "master" branch is tracking
a remote "master" branch, and if you are sitting on the "master" branch,
do this
git checkout mystuff
or if necessary
git checkout -b mystuff
before editing anything.
4) Constructive suggestion: In the all-too-common situation where you
forget what branch you are on and edit stuff on the wrong branch,
do this:
checkout -m mystuff
That will take the edits and merge them into where they belong. In my
experience, this is waaaay better than stashing.
5) I have a fancy "pre-commit hook" that prevents me from accidentally
committing something to a branch that shouldn't be modified.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
