diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:09 -0700 |
| commit | 2c657edce704ec7e91dfc03de5d882b4327369f4 (patch) | |
| tree | 9b31fd6e125296c3d19b3e759d377661f11d672d /git-rebase.sh | |
| parent | 3e95e47c5d0a09593c9a9ac50f84d04de577c6b0 (diff) | |
| parent | 8172c421d2c60a827bf300583fc2a676489d23af (diff) | |
| download | git-2c657edce704ec7e91dfc03de5d882b4327369f4.tar.gz | |
Merge branch 'sb/rebase-x'
"git rebase -x" can be used without passing "-i" option.
* sb/rebase-x:
t3404: cleanup double empty lines between tests
rebase: decouple --exec from --interactive
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index cf60c43908..0bf41ee72b 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -248,6 +248,7 @@ do ;; --exec=*) cmd="${cmd}exec ${1#--exec=}${LF}" + test -z "$interactive_rebase" && interactive_rebase=implied ;; --interactive) interactive_rebase=explicit @@ -348,12 +349,6 @@ do done test $# -gt 2 && usage -if test -n "$cmd" && - test "$interactive_rebase" != explicit -then - die "$(gettext "The --exec option must be used with the --interactive option")" -fi - if test -n "$action" then test -z "$in_progress" && die "$(gettext "No rebase in progress?")" |