X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=1583402a060793c25e49c3446c2a35fe27101883;hb=2af89f12c666634e92cd79a6c1af6acc34104c34;hp=3bd66b0a04bac05a3447d68112d4d933480eaf04;hpb=9269df96105dff5ecc137b598ac7664d218ac6be;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 3bd66b0a0..1583402a0 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -122,15 +122,14 @@ finish_rb_merge () { is_interactive () { test -f "$dotest"/interactive || - while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac - do + while :; do case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac shift done && test -n "$1" } is_interactive "$@" && exec git-rebase--interactive "$@" -while case "$#" in 0) break ;; esac +while test $# != 0 do case "$1" in --continue) @@ -216,9 +215,11 @@ do -v|--verbose) verbose=t ;; + --whitespace=*) + git_am_opt="$git_am_opt $1" + ;; -C*) - git_am_opt=$1 - shift + git_am_opt="$git_am_opt $1" ;; -*) usage