Re: Merge git-gui into 1.5.0 ?

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 12, 2007, 23:38 UTC
Message-ID: <Pine.LNX.4.63.0702130037530.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7v64a782ht.fsf@assigned-by-dhcp.cox.net>

Hi,

On Mon, 12 Feb 2007, Junio C Hamano wrote:

Show 10 quoted lines

> Ok, so here is what I did last night.
> 
> $ git remote show git-gui
> * remote git-gui
>   URL: git://repo.or.cz/git-gui.git/
>   Tracked remote branches
>     master
> $ git fetch git-gui
> $ git read-tree --prefix=git-gui/ git-gui/master
> $ git checkout git-gui

Didn't you mean "git checkout master" here?

> $ git rev-parse git-gui/master >.git/MERGE_HEAD
> $ git commit

Ciao, Dscho