diff options
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 9cf005677..3bd66b0a0 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -69,13 +69,10 @@ continue_merge () { die "$RESOLVEMSG" fi printf "Committed: %0${prec}d " $msgnum - git rev-list --pretty=oneline -1 HEAD | \ - sed 's/^[a-f0-9]\+ //' else printf "Already applied: %0${prec}d " $msgnum - git rev-list --pretty=oneline -1 "$cmt" | \ - sed 's/^[a-f0-9]\+ //' fi + git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //' prev_head=`git rev-parse HEAD^0` # save the resulting commit so we can read-tree on it later |