On Thu, Jan 8, 2009 at 11:15 AM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > Hi, > > On Thu, 8 Jan 2009, Geoff Russell wrote: > >> Dear gits, >> >> I have a series of commits: >> >> A---B---C---D---E---F >> >> I want to collapse B---C---D into one single commit. git rebase -i B >> will allow me to do this, but I'm looking for a non-interactive >> incantation. > > You set GIT_EDITOR to a script ;-) This is plan B. > > 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. Many thanks. Geoff. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
