aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
commitdb40a622395397c84c247d343ef62acc8775d6b2 (patch)
tree505448d2b765d17ce009e12809315fb07bb457d4 /contrib
parente6747627865347a534e7106bb1d14e32867b234d (diff)
parent6bc6b6c0dc0a58874a7a6b9afc3156a5cf9bb10d (diff)
downloadgit-db40a622395397c84c247d343ef62acc8775d6b2.tar.gz
git-db40a622395397c84c247d343ef62acc8775d6b2.tar.xz
Merge branch 'jt/format-patch-from-config'
"git format-patch" learned format.from configuration variable to specify the default settings for its "--from" option. * jt/format-patch-from-config: format-patch: format.from gives the default for --from
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6a187bc11..85bb8b579 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2182,6 +2182,7 @@ _git_config ()
format.attach
format.cc
format.coverLetter
+ format.from
format.headers
format.numbered
format.pretty