git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Commit to more than one branch at once?

From
Linus Torvalds <torvalds@osdl.org>
Date
Oct 6, 2006, 18:37 UTC
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:
Show 7 quoted lines
> 
> 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
Previous: Stefan RichterNext: Sean
Message 2 of 5 in “Commit to more than one branch at once?”
  1. Stefan RichterOct 6, 2006
  2. Linus TorvaldsOct 6, 2006
  3. SeanOct 6, 2006
  4. Stefan RichterOct 6, 2006
  5. Petr BaudisOct 6, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.