[PATCH 0/5] rebase: improve the keep-empty

2013-05-28 Thread Felipe Contreras
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

Re: [PATCH 0/5] rebase: improve the keep-empty

2013-05-28 Thread Felipe Contreras
On Tue, May 28, 2013 at 8: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.

Re: [PATCH 0/5] rebase: improve the keep-empty

2013-05-28 Thread Martin von Zweigbergk
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,

Re: [PATCH 0/5] rebase: improve the keep-empty

2013-05-28 Thread Felipe Contreras
Martin von Zweigbergk wrote: 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). I think it does make sense. But I still would prefer 'git rebase' to rely