Merge branch 'jn/doc-api-errors'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index cd765795ae42edfdf21a054619b64d5c3800f4f6..c21190d7510c173482b7784f9e8c4bf0b56cb1e1 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1425,7 +1425,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:"
@@ -1693,6 +1693,7 @@ _git_rebase ()
                        --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --whitespace=
                        --autosquash --fork-point --no-fork-point
+                       --autostash
                        "
 
                return