Merge branch 'ns/pretty-format'

[~andy/git] / contrib / completion / git-completion.bash

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 90ba428e94a5e167192cbabf06fa0ccc2b60c8f7..f234c34304181d0c6b00349be3bd9c14d1e538ea 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1018,6 +1018,11 @@ _git_log ()
                        " "" "${cur##--pretty=}"
                return
                ;;
+       --format=*)
+               __gitcomp "$__git_log_pretty_formats
+                       " "" "${cur##--format=}"
+               return
+               ;;
        --date=*)
                __gitcomp "
                        relative iso8601 rfc2822 short local default
@@ -1033,7 +1038,7 @@ _git_log ()
                        --follow
                        --abbrev-commit --abbrev=
                        --relative-date --date=
-                       --pretty=
+                       --pretty= --format= --oneline
                        --cherry-pick
                        --graph
                        --decorate
@@ -1545,8 +1550,13 @@ _git_show ()
                        " "" "${cur##--pretty=}"
                return
                ;;
+       --format=*)
+               __gitcomp "$__git_log_pretty_formats
+                       " "" "${cur##--format=}"
+               return
+               ;;
        --*)
-               __gitcomp "--pretty=
+               __gitcomp "--pretty= --format=
                        $__git_diff_common_options
                        "
                return