From: Linus Torvalds <torvalds@osdl.org>
Date: Fri, 06 Oct 2006 18:37:36 GMT
Subject: Re: Commit to more than one branch at once?
Message-ID: <Pine.LNX.4.64.0610061136250.3952@g5.osdl.org>
In-Reply-To: <45269E02.50407@s5r6.in-berlin.de>



On Fri, 6 Oct 2006, Stefan Richter wrote:
> 
> if I git-cherry-pick a commit from branch A into branch B, this is shown
> as a difference in "git-log B..A".
> 
> Is it possible to commit a change to two or more branches but preserve
> the identity of the change? IOW, is there an alternative to
> git-cherry-pick that does not have above mentioned side effect?

If you _merge_ the change into both branches, it will be the identical 
commit in both.

So for example, one thing people can do is to have a separate "fixes" 
branch that is used for generic bugfixes and, which is merged into all 
other relevant branches.

		Linus