From: Junio C Hamano <junkio@cox.net>
Date: Mon, 12 Feb 2007 21:55:42 GMT
Subject: Re: Merge git-gui into 1.5.0 ?
Message-ID: <7v64a782ht.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070211224158.GA31488@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> writes:

> git-gui development is going to continue past 1.5.0's release.
> There are still a lot of operations it should support that it
> currently does not do, and there are certainly user interface
> improvements that can still be made.
>
> It may be saner for all involved if that development happens in
> the git-gui.git repository, with drops made to git.git by way of
> merging the "subproject" every so often.

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
$ git rev-parse git-gui/master >.git/MERGE_HEAD
$ git commit