Re: collapsing commits with rebase

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 8, 2009, 11:07 UTC
Message-ID: <alpine.DEB.1.00.0901081205120.30769@pacific.mpi-cbg.de>
In-Reply-To: <93c3eada0901071759u2496835dy134d92613bf4244b@mail.gmail.com>

Hi,

On Thu, 8 Jan 2009, Geoff Russell wrote:

Show 13 quoted lines

> On Thu, Jan 8, 2009 at 11:15 AM, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
>
> > Alternatively, something like this should work for you:
> >
> >        $ git checkout A
> >        $ git read-tree -u -m D
> >        $ git commit -m "My message"
> >        $ git cherry-pick E
> >        $ git cherry-pick F
> 
> Plan B is looking good, because I'd generally like the commit message to 
> be the concatenation of the messages for B,C and D.

Replace the commit call by this:

	$ for commit in B C D
	  do
		git cat-file commit $commit | sed '1,/^$/d'
		# possibly add an empty line between the commit messages,
		# git commit will strip away empty lines at the end.
	  done |
	  git commit -F -

Hth, Dscho