From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Jan 2015 20:33:57 +0000 (-0800)
Subject: Merge branch 'mm/complete-rebase-autostash'
X-Git-Tag: v2.3.0-rc1~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc?hp=8128835f91f67741c931858d5523f1ee57ef0fce

Merge branch 'mm/complete-rebase-autostash'

* mm/complete-rebase-autostash:
git-completion: add --autostash for 'git rebase'
---

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