diff options
| author |  Todd Zullinger <tmz@pobox.com> | 2009-04-05 12:33:38 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-05 12:04:22 -0700 |
| commit | 43acdf243ee8a8fa876bdd6659026fe5ed2d4c24 (patch) | |
| tree | 0064ef40a7bcbbc4358a09862cfebd11b1d54dea /contrib | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-43acdf243ee8a8fa876bdd6659026fe5ed2d4c24.tar.xz | |
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')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 3 |
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 |