Teach rebase the --no-ff option.

diff --git a/git-pull.sh b/git-pull.sh
index 2de4c3aa70c10203aebe4e117b30422e39f41e02..d45b50cf4783912cedc4b7764a609ea9b4176969 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -38,7 +38,7 @@ test -z "$(git ls-files -u)" || die_conflict
 test -f "$GIT_DIR/MERGE_HEAD" && die_merge
 
 strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
-log_arg= verbosity=
+log_arg= verbosity= progress=
 merge_args=
 curr_branch=$(git symbolic-ref -q HEAD)
 curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
@@ -50,6 +50,8 @@ do
                verbosity="$verbosity -q" ;;
        -v|--verbose)
                verbosity="$verbosity -v" ;;
+       --progress)
+               progress=--progress ;;
        -n|--no-stat|--no-summary)
                diffstat=--no-stat ;;
        --stat|--summary)
@@ -214,7 +216,7 @@ test true = "$rebase" && {
        done
 }
 orig_head=$(git rev-parse -q --verify HEAD)
-git fetch $verbosity --update-head-ok "$@" || exit 1
+git fetch $verbosity $progress --update-head-ok "$@" || exit 1
 
 curr_head=$(git rev-parse -q --verify HEAD)
 if test -n "$orig_head" && test "$curr_head" != "$orig_head"
@@ -275,7 +277,7 @@ true)
 *)
        eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
        eval="$eval  $log_arg $strategy_args $merge_args"
-       eval="$eval \"$merge_name\" HEAD $merge_head $verbosity"
+       eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity"
        ;;
 esac
 eval "exec $eval"