Re: [PATCH 7/7] rebase (without -p): correctly calculate patches to rebase

2012-07-20 Thread Martin von Zweigbergk
On Fri, Jul 20, 2012 at 1:18 AM, Johannes Sixt wrote: > Am 7/18/2012 9:27, schrieb Martin von Zweigbergk: >> diff --git a/git-rebase--am.sh b/git-rebase--am.sh >> index 37c1b23..fe3fdd1 100644 >> --- a/git-rebase--am.sh >> +++ b/git-rebase--am.sh >> @@ -16,11 +16,9 @@ skip) >> ;; >> esac >>

Re: [PATCH 7/7] rebase (without -p): correctly calculate patches to rebase

2012-07-20 Thread Johannes Sixt
Am 7/18/2012 9:27, schrieb Martin von Zweigbergk: > diff --git a/git-rebase--am.sh b/git-rebase--am.sh > index 37c1b23..fe3fdd1 100644 > --- a/git-rebase--am.sh > +++ b/git-rebase--am.sh > @@ -16,11 +16,9 @@ skip) > ;; > esac > > -test -n "$rebase_root" && root_flag=--root > test -n "$kee

[PATCH 7/7] rebase (without -p): correctly calculate patches to rebase

2012-07-18 Thread Martin von Zweigbergk
The different types of rebase use different ways of calculating the patches to rebase. 'git rebase' (without -m/-i/-p) uses git format-patch --ignore-if-in-upstream $upstream..$orig_head 'git rebase -m' uses git rev-list $upstream..$orig_head 'git rebase -i' (without -p) uses git rev-li