Re: git diffs

2005-08-01 Thread Linus Torvalds
On Mon, 1 Aug 2005, Matthias Urlichs wrote: > > Hi, Linus Torvalds wrote: > > > git checkout -f master > > git-rev-parse master > .git/refs/heads/merge-branch > > > > # > > # Switch to it, always leaving "master" untouched > > # > > git checkout -f merge-branch > > Isn'

Re: git diffs

2005-08-01 Thread Matthias Urlichs
Hi, Linus Torvalds wrote: > git checkout -f master > git-rev-parse master > .git/refs/heads/merge-branch > > # > # Switch to it, always leaving "master" untouched > # > git checkout -f merge-branch Isn't that equivalent to (but slower than) git checkout -

Re: git diffs

2005-07-31 Thread Linus Torvalds
On Sun, 31 Jul 2005, Andrew Morton wrote: > > So I finally decided to take a look at my git problems. Discovered I > couldn't fix them with zero git knowledge :( Heh. We're here to please. I'll cc the git list too, because there really _are_ a lot of people out there that know it fairly well