From: Todd Zullinger Date: Sun, 5 Apr 2009 16:33:38 +0000 (-0400) Subject: bash completion: Update 'git am' options X-Git-Tag: v1.6.3-rc0~38 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43acdf243ee8a8fa876bdd6659026fe5ed2d4c24;p=git.git 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 --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e72ce2428..d3d820317 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