diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-26 11:24:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-26 11:24:13 -0700 |
| commit | d1926f63ec93e84dba1a54c5de898fb517d9ca59 (patch) | |
| tree | 28dc4bd392df6aa5bb063742fa3bea277bdd7f86 /git-rebase--interactive.sh | |
| parent | feab68cd91439cb9eef26f7197ac857da1238a49 (diff) | |
| parent | 1830d9cb62772c0626297e4bb6e537664283ebfa (diff) | |
| download | git-d1926f63ec93e84dba1a54c5de898fb517d9ca59.tar.gz | |
Merge branch 'gp/maint-rebase-p-onto'
* gp/maint-rebase-p-onto:
Fix rebase -p --onto
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index f96d887d23..23ded48322 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -703,7 +703,7 @@ first and then run 'git rebase --continue' again." preserve=t for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-) do - if test -f "$REWRITTEN"/$p -a \( $p != $UPSTREAM -o $sha1 = $first_after_upstream \) + if test -f "$REWRITTEN"/$p -a \( $p != $ONTO -o $sha1 = $first_after_upstream \) then preserve=f fi |