Merge branch 'mm/complete-rebase-autostash'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:33:57 +0000 (12:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:33:57 +0000 (12:33 -0800)
* mm/complete-rebase-autostash:
git-completion: add --autostash for 'git rebase'

contrib/completion/git-completion.bash
index cd765795ae42edfdf21a054619b64d5c3800f4f6..8cfee95f88006269e4227f98701b9af8587af0bd 100644 (file)
@@ -1693,6 +1693,7 @@ _git_rebase ()
                        --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --whitespace=
                        --autosquash --fork-point --no-fork-point
+                       --autostash
                        "
 
                return