Re: collapsing commits with rebase
- From
Geoff Russell <geoffrey.russell@gmail.com>
- Date
- Jan 10, 2009, 10:34 UTC
- Message-ID
- <93c3eada0901100234w37724281q424698f452b0148b@mail.gmail.com>
- In-Reply-To
- <alpine.DEB.1.00.0901081205120.30769@pacific.mpi-cbg.de>
On 1/8/09, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 32 quoted lines
> Hi, > > On Thu, 8 Jan 2009, Geoff Russell wrote: > > > 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
That makes sense, many thanks.
Cheers, Geoff.