diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 07:28:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 07:28:51 +0300 |
| commit | 850e9257525ef2fa13e1d34ccce4e6b73085bb4e (patch) | |
| tree | 9de3df7ba23ef1db1b95d1a51d98f00ce784711f /git-rebase--merge.sh | |
| parent | d892beef52a293b271538481dbc76014672ddf09 (diff) | |
| parent | da27a6fbd50861149b32cfd1f9e5c36a935c575a (diff) | |
Merge branch 'pw/rebase-signoff'
"git rebase" has learned to honor "--signoff" option when using
backends other than "am" (but not "--preserve-merges").
* pw/rebase-signoff:
rebase --keep-empty: always use interactive rebase
rebase -p: error out if --signoff is given
rebase: extend --signoff support
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 685f48ca49..cf4c042214 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -27,7 +27,7 @@ continue_merge () { cmt=$(cat "$state_dir/current") if ! git diff-index --quiet --ignore-submodules HEAD -- then - if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message \ + if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} $signoff $allow_empty_message \ --no-verify -C "$cmt" then echo "Commit failed, please do not call \"git commit\"" |