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

Re: What's in git.git

From
RARyan Anderson <ryan@michonline.com>
Date
Feb 9, 2006, 23:30 UTC
Message-ID
<20060209233059.GH20880@mythryan2.michonline.com>
In-Reply-To
<12c511ca0602091514p35c3904bha8d5d406e5472969@mail.gmail.com>
On Thu, Feb 09, 2006 at 03:14:59PM -0800, Tony Luck wrote:
Show 27 quoted lines
> On 2/8/06, Junio C Hamano <junkio@cox.net> wrote:
> >  * If there are patches sent to improve a topic branch in it,
> >    they will be applied to the topic branch, and then the topic
> >    branch is merged into "next", without any funny rewinding or
> >    rebasing of "next".  This will make the "next" branch
> >    cluttered with repeated merges from the same topic branch,
> >    but that is OK.  "next" will not be merged into "master",
> >    ever.
> >
> >  * Once a topic is fully cooked, the topic branch will be merged
> >    into "master".
> 
> This is pretty much the workflow in my test/release branches (mostly
> documented in Documentation/howto/using-topic-branches.txt).
> 
> I've sometimes wondered about re-creating the topic branches in
> the case where there have been a series of follow-on commits
> before pulling them into the release branch.  The goal would be
> to present history not as it was, but as it should have been if we
> didn't have all the dumb mistakes and typos.
> 
> So is there an easy way in git to take the series of commits
> from a topic branch, make a new branch with all those commits
> as just one commit ... with an open editor on the concatenated
> commit comments (If there were just typo fixes the comment
> from the first commit would apply, but sometimes the follow-on
> commits would have substantive changes).

git checkout topic git format-patch --stdout origin > topic-diff $VISUAL topic-diff # Fix comments git checkout master git checkout -b new-topic master git-am topic-diff

.. done?

(I typically do something akin to this before sending patches to Junio, by looking at the output of format-patch in a directory, editing, combining a few changes if necessary, then re-committing, re-running format-patch, and sending the output upstream.)

-- 
Ryan Anderson
  sometimes Pug Majere
Previous: Tony LuckNext: Junio C Hamano
Message 14 of 16 in “What's in git.git”
  1. Junio C HamanoFeb 9, 2006
  2. seanFeb 9, 2006
  3. Andreas EricssonFeb 9, 2006
  4. seanFeb 9, 2006
  5. Junio C HamanoFeb 9, 2006
  6. Andreas EricssonFeb 9, 2006
  7. Junio C HamanoFeb 9, 2006
  8. Andreas EricssonFeb 9, 2006
  9. Junio C HamanoFeb 10, 2006
  10. Johannes SchindelinFeb 9, 2006
  11. Junio C HamanoFeb 9, 2006
  12. Johannes SchindelinFeb 9, 2006
  13. Tony LuckFeb 9, 2006
  14. Ryan AndersonFeb 9, 2006
  15. Junio C HamanoFeb 9, 2006
  16. Junio C HamanoFeb 10, 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.