Re: Merge git-gui into 1.5.0 ?

Johannes Schindelin [off-list ref] wrote:

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

quoted

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?

I don't think so.  At this point the subdirectory git-gui is known
in the index, so Junio is trying to get checkout-index to process
those paths and create it in the working directory.
 

quoted

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

-- 
Shawn.