diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-13 00:12:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-13 00:12:51 -0700 |
| commit | 755d62788f0507781dbbf0ed1278b65ff4829185 (patch) | |
| tree | be21e68b1c62bf14fc6a2d0f0f94dcb856f1ddad /git-format-patch-script | |
| parent | 8eb14dc1882ade6f881ae93dfd7ecaa0dc0f0fdc (diff) | |
| parent | af36b70ef939cc44c447a4b9cbaadd7eba9a20b1 (diff) | |
Merge master changes into release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-format-patch-script')
| -rwxr-xr-x | git-format-patch-script | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/git-format-patch-script b/git-format-patch-script index c0081697da..ebe6616494 100755 --- a/git-format-patch-script +++ b/git-format-patch-script @@ -6,7 +6,7 @@ . git-sh-setup-script || die "Not a git archive." usage () { - echo >&2 "usage: $0"' [-n] [-o dir] [--mbox] [--check] [-<diff options>...] upstream [ our-head ] + echo >&2 "usage: $0"' [-n] [-o dir] [--mbox] [--check] [--sign] [-<diff options>...] upstream [ our-head ] Prepare each commit with its patch since our-head forked from upstream, one file per patch, for e-mail submission. Each output file is @@ -46,6 +46,8 @@ do date=t author=t mbox=t ;; -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered) numbered=t ;; + -s|--s|--si|--sig|--sign) + signoff=t ;; -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\ --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\ --output-direc=*|--output-direct=*|--output-directo=*|\ @@ -174,6 +176,14 @@ Date: '"$ad" b body' sed -ne "$mailScript" <$commsg + + test "$signoff" = "t" && { + offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'` + echo + echo "Signed-off-by: $offsigner" + echo + } + echo '---' echo git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary |