Merge branch 'mm/complete-rebase-autostash'

gitster · gitster · commit 1e7ef5d9bf49 · 2015-01-14T12:33:57.000-08:00
* 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
@@ -1693,6 +1693,7 @@ _git_rebase ()
 			--committer-date-is-author-date --ignore-date
 			--ignore-whitespace --whitespace=
 			--autosquash --fork-point --no-fork-point
+			--autostash
 			"
 
 		return

Original file line number	Diff line number	Diff line change
`@@ -1693,6 +1693,7 @@ _git_rebase ()`
`1693`	`1693`	`--committer-date-is-author-date --ignore-date`
`1694`	`1694`	`--ignore-whitespace --whitespace=`
`1695`	`1695`	`--autosquash --fork-point --no-fork-point`
	`1696`	`+ --autostash`
`1696`	`1697`	`"`
`1697`	`1698`
`1698`	`1699`	`return`