summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-22 09:45:22 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-22 09:45:22 -0700
commit6bead0c3203431ca63a6b1e7cf47c659f1a7021d (patch)
tree4d5d44220f9922186cc9132b483ccfbdfd5c42ea /contrib/completion
parent223a923c37f76ee91eb6a9cb77ce6d31dcf939cc (diff)
parentd8e1e5df950f2c514a01696a0a0ff53fb1a07651 (diff)
downloadgit-6bead0c3203431ca63a6b1e7cf47c659f1a7021d.tar.gz
Merge branch 'sb/format-patch-signature'
* sb/format-patch-signature: completion: Add --signature and format.signature format-patch: Add a signature option (--signature)
Diffstat (limited to 'contrib/completion')
-rwxr-xr-xcontrib/completion/git-completion.bash3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index aebb0b6890..14874377af 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1052,7 +1052,7 @@ _git_format_patch ()
--numbered --start-number
--numbered-files
--keep-subject
- --signoff
+ --signoff --signature --no-signature
--in-reply-to= --cc=
--full-index --binary
--not --all
@@ -1726,6 +1726,7 @@ _git_config ()
format.headers
format.numbered
format.pretty
+ format.signature
format.signoff
format.subjectprefix
format.suffix