From: Martin Waitz <tali@admingilde.org>
Date: Mon, 29 May 2006 21:37:04 GMT
Subject: Re: [RFC] git commit --branch
Message-ID: <20060529213704.GG14325@admingilde.org>
In-Reply-To: <Pine.LNX.4.63.0605292310280.17412@wbgn013.biozentrum.uni-wuerzburg.de>

hoi :)

On Mon, May 29, 2006 at 11:14:32PM +0200, Johannes Schindelin wrote:
> Doesn't
> 
> $ git-update-index $(git-ls-files --modified)
> $ git-checkout -b tempBranch
> $ git-commit -m "to test"
> 
> work? It also avoids totally bogus parents (if I read your patch 
> correctly, you take the current HEAD as the true parent, but record the 
> current HEAD of the other branch as parent nevertheless).

I'm doing two commits, one to HEAD and one to the other branch.
It is more like:

	git commit
	git checkout otherbranch
	git rebase --onto otherbranch master^ master   <-- first
	git checkout master
	git merge msg master otherbranch               <-- second

Now your current HEAD is still a merge of your topic branches,
and you commited your changes to one clean topic branch.

-- 
Martin Waitz