Hi,

I agree with Eric's comment about the subject line.

Quoting Koosha Khajehmoogahi <koo...@posteo.de>:

Signed-off-by: Koosha Khajehmoogahi <koo...@posteo.de>
---
  contrib/completion/git-completion.bash | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 731c289..b63bb95 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1406,7 +1406,7 @@ _git_ls_tree ()
  __git_log_common_options="
        --not --all
        --branches --tags --remotes
-       --first-parent --merges --no-merges
+       --first-parent --merges --merges= --no-merges
        --max-count=
        --max-age= --since= --after=
        --min-age= --until= --before=
@@ -1451,6 +1451,10 @@ _git_log ()
                __gitcomp "long short" "" "${cur##--decorate=}"
                return
                ;;
+    --merges=*)
+        __gitcomp "show hide only" "" "${cur##--merges=}"
+        return
+        ;;

Funny indentation, please use tabs instead of spaces.

Otherwise this patch looks good.

        --*)
                __gitcomp "
                        $__git_log_common_options
@@ -1861,6 +1865,10 @@ _git_config ()
                __gitcomp "$__git_log_date_formats"
                return
                ;;
+       log.merges)
+               __gitcomp "show hide only"
+               return
+               ;;
        sendemail.aliasesfiletype)
                __gitcomp "mutt mailrc pine elm gnus"
                return
@@ -2150,6 +2158,7 @@ _git_config ()
                interactive.singlekey
                log.date
                log.decorate
+               log.merges
                log.showroot
                mailmap.file
                man.
--
2.3.3.263.g095251d.dirty


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to