completion: update am, commit, and log

git am learned --scissors, git commit learned --dry-run and git log
learned --decorate=long|short recently.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2c2a0d4614a5180a08adfa59414d06fdbe7754f0..daccbcc33e66cef1132d63f83dd482f06af93fe3 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -668,7 +668,7 @@ _git_am ()
                        --3way --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --ignore-space-change
                        --interactive --keep --no-utf8 --signoff --utf8
                        --3way --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --ignore-space-change
                        --interactive --keep --no-utf8 --signoff --utf8

-                       --whitespace=
+                       --whitespace= --scissors

                        "
                return
        esac
                        "
                return
        esac


@@ -894,6 +894,7 @@ _git_commit ()
                __gitcomp "
                        --all --author= --signoff --verify --no-verify
                        --edit --amend --include --only --interactive
                __gitcomp "
                        --all --author= --signoff --verify --no-verify
                        --edit --amend --include --only --interactive

+                       --dry-run

                        "
                return
        esac
                        "
                return
        esac


@@ -1179,6 +1180,10 @@ _git_log ()
                __gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
                return
                ;;
                __gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
                return
                ;;

+       --decorate=*)
+               __gitcomp "long short" "" "${cur##--decorate=}"
+               return
+               ;;

        --*)
                __gitcomp "
                        $__git_log_common_options
        --*)
                __gitcomp "
                        $__git_log_common_options


@@ -1191,7 +1196,7 @@ _git_log ()
                        --pretty= --format= --oneline
                        --cherry-pick
                        --graph
                        --pretty= --format= --oneline
                        --cherry-pick
                        --graph

-                       --decorate
+                       --decorate --decorate=

                        --walk-reflogs
                        --parents --children
                        $merge
                        --walk-reflogs
                        --parents --children
                        $merge