diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index 38331a861..5dbc4387f 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -266,6 +266,15 @@ then exit fi +if test true = "$rebase" +then + o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref) + if test "$oldremoteref" = "$o" + then + unset oldremoteref + fi +fi + merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit case "$rebase" in true) |