Merge branch 'maint'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index da46bf81e6885d7b72f3112a80b692b95cfbd7a8..35acad004e041d6c35316373635da45b61f6e8c0 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1386,6 +1386,7 @@ _git_rebase ()
                        --preserve-merges --stat --no-stat
                        --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --whitespace=
+                       --autosquash
                        "
 
                return