diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-03-20 11:10:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 11:09:03 -0700 |
| commit | b79966aa386fc58801e93496cd4e97d82acd53a5 (patch) | |
| tree | 0db85d1337eea78f37418389c980e409c284e685 | |
| parent | a852ec7f273cf61296a80ddfc26c23acf2163f2f (diff) | |
| download | git-b79966aa386fc58801e93496cd4e97d82acd53a5.tar.gz | |
rebase -p: error out if --signoff is given
rebase --preserve-merges does not support --signoff so error out
rather than just silently ignoring it so that the user knows the
commits will not be signed off.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 |