Merge branch 'cc/sha1-bsearch'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index fdc5a24b27c4df13d44d98da1dbbd4ade1178589..c1c879821dc5c6314346d8c55c79fafdf48b5ac1 100755 (executable)
--- 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