diff options
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 5a5a65f3d2..e65b65acb4 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -472,6 +472,8 @@ fi if test -n "$signoff" then + test -n "$preserve_merges" && + die "$(gettext "error: cannot combine '--signoff' with '--preserve-merges'")" git_am_opt="$git_am_opt $signoff" force_rebase=t fi |