Re: [PATCH/RFC/GSoC 06/17] rebase-am: introduce am backend for builtin rebase

2016-03-19 Thread Johannes Schindelin
Hi Paul, On Sat, 12 Mar 2016, Paul Tan wrote: > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 40176ca..ec63d3b 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -8,6 +8,22 @@ > #include "remote.h" > #include "branch.h" > #include "refs.h" > +#include "rebase-am.h" > + >

[PATCH/RFC/GSoC 06/17] rebase-am: introduce am backend for builtin rebase

2016-03-12 Thread Paul Tan
Since 7f59dbb (Rewrite rebase to use git-format-patch piped to git-am., 2005-11-14), git-rebase will by default use "git am" to rebase commits. This is done by first checking out to the new base commit, generating a series of patches with the commits to replay, and then applying them with git-am.