summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-05-16 12:05:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-16 12:05:23 (GMT)
commit483932a3d8dae23207de8ec8683a5236ef3098d9 (patch)
tree39286e75cc8f9bf8b016965fc384ee078a117a98 /contrib/completion
parentc8e34a7ac20b5d512cb2f1f789eca2a3b12b129f (diff)
parent59b519ab7e703ebdbad06bd9ba3cae6e55d880d0 (diff)
downloadgit-483932a3d8dae23207de8ec8683a5236ef3098d9.zip
git-483932a3d8dae23207de8ec8683a5236ef3098d9.tar.gz
git-483932a3d8dae23207de8ec8683a5236ef3098d9.tar.bz2
Merge branch 'dd/mailinfo-quoted-cr'
"git mailinfo" (hence "git am") learned the "--quoted-cr" option to control how lines ending with CRLF wrapped in base64 or qp are handled. * dd/mailinfo-quoted-cr: am: learn to process quoted lines that ends with CRLF mailinfo: allow stripping quoted CR without warning mailinfo: allow squelching quoted CRLF warning mailinfo: warn if CRLF found in decoded base64/QP email mailinfo: stop parsing options manually mailinfo: load default metainfo_charset lazily
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-completion.bash5
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5722ef0..3c5739b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1333,6 +1333,7 @@ __git_whitespacelist="nowarn warn error error-all fix"
__git_patchformat="mbox stgit stgit-series hg mboxrd"
__git_showcurrentpatch="diff raw"
__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
+__git_quoted_cr="nowarn warn strip"
_git_am ()
{
@@ -1354,6 +1355,10 @@ _git_am ()
__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
return
;;
+ --quoted-cr=*)
+ __gitcomp "$__git_quoted_cr" "" "${cur##--quoted-cr=}"
+ return
+ ;;
--*)
__gitcomp_builtin am "" \
"$__git_am_inprogress_options"