Re: What's in git.git

From: Junio C Hamano <junkio@cox.net>
Date: Feb 9, 2006, 23:44 UTC
Message-ID: <7virro6qt4.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <12c511ca0602091514p35c3904bha8d5d406e5472969@mail.gmail.com>

Tony Luck <tony.luck@intel.com> writes:

Show 6 quoted lines

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

I do not have a script to do so but my guess is that would be a 20-30 line shell script. Use cherry to find which ones to pick, run diff-tree on them to extract patches, run apply --index on each of them in turn, and dump "git log master..topic" to your editor and you are done. The editor would have the commit log to be edited while working tree and the index would have a ready-to-commit tree with all the changes applied.