Hi, I think I have some patches at home that instead teach 'git am' the --keep-empty flag. Does that make sense? It's been a while since I looked at it, but I'll try to take a look tonight (PST).
Martin On Tue, May 28, 2013 at 6:29 AM, Felipe Contreras <felipe.contre...@gmail.com> wrote: > Hi, > > I've been analyzing 'git rebase' and found that the --keep-empty option > triggers a very very different behavior. Here's a bunch of patches that make > it > behave like the 'am' does does for the most part. > > There's only a few minor changes, after which it might be possible to replace > the whole 'am' mode to use cherr-pick instead. > > Felipe Contreras (5): > rebase: split the cherry-pick stuff > rebase: fix 'cherry' mode storage > rebase: fix sequence continuation > rebase: fix abort of cherry mode > rebase: fix cherry-pick invocations > > .gitignore | 1 + > Makefile | 1 + > git-rebase--am.sh | 65 > ++++++++++++++++++++++----------------------------- > git-rebase--cherry.sh | 55 +++++++++++++++++++++++++++++++++++++++++++ > git-rebase.sh | 8 +++++++ > 5 files changed, 93 insertions(+), 37 deletions(-) > create mode 100644 git-rebase--cherry.sh > > -- > 1.8.3.rc3.312.g47657de > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
