Re: git diffs

From: Linus Torvalds <torvalds@osdl.org>
Date: 2005-08-02 01:51:13
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'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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Tue Aug 02 01:56:05 2005

This archive was generated by hypermail 2.1.8 : 2005-08-02 01:56:08 EST