Merge branch 'ac/complete-pull-autostash'

gitster · gitster · commit 00bcc35081f6 · 2017-12-06T09:23:37.000-08:00
The shell completion (in contrib/) learned that "git pull" can take
the "--autostash" option.

* ac/complete-pull-autostash:
  completion: add --autostash and --no-autostash to pull
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1922,6 +1922,7 @@ _git_pull ()
 	--*)
 		__gitcomp "
 			--rebase --no-rebase
+			--autostash --no-autostash
 			$__git_merge_options
 			$__git_fetch_options
 		"

Original file line number	Diff line number	Diff line change
`@@ -1922,6 +1922,7 @@ _git_pull ()`
`1922`	`1922`	`--*)`
`1923`	`1923`	`__gitcomp "`
`1924`	`1924`	`--rebase --no-rebase`
	`1925`	`+ --autostash --no-autostash`
`1925`	`1926`	`$__git_merge_options`
`1926`	`1927`	`$__git_fetch_options`
`1927`	`1928`	`"`