rebase -i: Make the condition for an "if" more transparent

diff --git a/git-pull.sh b/git-pull.sh
index 37f3d9301715cd9db92c346c6dcbfe6602a19a35..502af1a9c44382636c5c0f62d0f76ec789960933 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -174,7 +174,7 @@ then
        # First update the working tree to match $curr_head.
 
        echo >&2 "Warning: fetch updated the current branch head."
-       echo >&2 "Warning: fast forwarding your working tree from"
+       echo >&2 "Warning: fast-forwarding your working tree from"
        echo >&2 "Warning: commit $orig_head."
        git update-index -q --refresh
        git read-tree -u -m "$orig_head" "$curr_head" ||
@@ -216,7 +216,7 @@ fi
 
 merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
 test true = "$rebase" &&
-       exec git-rebase $diffstat $strategy_args --onto $merge_head \
+       exec git rebase $diffstat $strategy_args --onto $merge_head \
        ${oldremoteref:-$merge_head}
-exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
-       "$merge_name" HEAD $merge_head $verbosity
+exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
+       -m "$merge_name" $merge_head