diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-26 15:39:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-26 15:39:02 +0900 |
| commit | 768c7cb710a970a522320f712f028f17eabc66ed (patch) | |
| tree | da06e286e7c9af1770deddb554a93a7fcfce8935 /git-rebase.sh | |
| parent | Getting ready for -rc1 (diff) | |
| parent | rebase: pass --[no-]signoff option to git am (diff) | |
| download | git-768c7cb710a970a522320f712f028f17eabc66ed.tar.gz git-768c7cb710a970a522320f712f028f17eabc66ed.zip | |
Merge branch 'gb/rebase-signoff'
"git rebase" learns "--signoff" option.
* gb/rebase-signoff:
rebase: pass --[no-]signoff option to git am
builtin/am: fold am_signoff() into am_append_signoff()
builtin/am: honor --signoff also when --rebasing
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 48d7c5ded4..db1deed846 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -34,6 +34,7 @@ root! rebase all reachable commits up to the root(s) autosquash move commits that begin with squash!/fixup! under -i committer-date-is-author-date! passed to 'git am' ignore-date! passed to 'git am' +signoff passed to 'git am' whitespace=! passed to 'git apply' ignore-whitespace! passed to 'git apply' C=! passed to 'git apply' @@ -321,7 +322,7 @@ do --ignore-whitespace) git_am_opt="$git_am_opt $1" ;; - --committer-date-is-author-date|--ignore-date) + --committer-date-is-author-date|--ignore-date|--signoff|--no-signoff) git_am_opt="$git_am_opt $1" force_rebase=t ;; |