Re: What's in git.git

From: Tony Luck <tony.luck@intel.com>
Date: Feb 9, 2006, 23:14 UTC
Message-ID: <12c511ca0602091514p35c3904bha8d5d406e5472969@mail.gmail.com>
In-Reply-To: <7vslqtf2p1.fsf@assigned-by-dhcp.cox.net>

On 2/8/06, Junio C Hamano <junkio@cox.net> wrote:

Show 10 quoted lines

>  * 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).

-Tony