Merge branch 'jg/cguide-we-cannot-count'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 661a8294dac162f0e50ccfe588847bb45b572143..fbe597232c11c05c1b8f9c366232d52f050b8d51 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1422,7 +1422,7 @@ __git_log_gitk_options="
 # Options that go well for log and shortlog (not gitk)
 __git_log_shortlog_options="
        --author= --committer= --grep=
-       --all-match
+       --all-match --invert-grep
 "
 
 __git_log_pretty_formats="oneline short medium full fuller email raw format:"
@@ -2186,6 +2186,7 @@ _git_config ()
                pull.octopus
                pull.twohead
                push.default
+               push.followTags
                rebase.autosquash
                rebase.stat
                receive.autogc