summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2009-04-05 12:33:38 -0400
committerJunio C Hamano <gitster@pobox.com>2009-04-05 12:04:22 -0700
commit43acdf243ee8a8fa876bdd6659026fe5ed2d4c24 (patch)
tree0064ef40a7bcbbc4358a09862cfebd11b1d54dea /contrib/completion
parent81aa96497686bd31c5a9a3cdf110c2e10c799c03 (diff)
downloadgit-43acdf243ee8a8fa876bdd6659026fe5ed2d4c24.tar.gz
bash completion: Update 'git am' options
This adds --committer-date-is-author-date, --ignore-date, and --no-utf8 options. The --binary option is removed, as it was made a no-op by cb3a160. The option list is also sorted alphabetically. Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e72ce2428d..d3d8203171 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -646,7 +646,8 @@ _git_am ()
;;
--*)
__gitcomp "
- --signoff --utf8 --binary --3way --interactive
+ --3way --committer-date-is-author-date --ignore-date
+ --interactive --keep --no-utf8 --signoff --utf8
--whitespace=
"
return