Re: git diffs

From: Linus Torvalds <torvalds@osdl.org>
Date: Aug 1, 2005, 15:51 UTC
Message-ID: <Pine.LNX.4.58.0508010849390.14342@g5.osdl.org>
In-Reply-To: <pan.2005.08.01.07.55.40.43904@smurf.noris.de>

On Mon, 1 Aug 2005, Matthias Urlichs wrote:

Show 14 quoted lines

>
> 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 -f -b merge-branch master

No.

If you had a previous merge-branch (because something went wrong last time, and you just re-start the whole thing), you really want to _first_ force the branch to "master", and then create the new merge-branch.

Also, the last "git checkout -f merge-branch" will be pretty much zero time, because the stuff is already at the right point, so it will basically end up just re-doing the symlink.

So I did it that strange way for a reason.

		Linus