completion: add --autostash and --no-autostash to pull

albert-astals-cid-kdab · gitster · commit 541c2a3a3db9 · 2017-11-22T16:31:43.000+09:00
Ideally we should only autocomplete if pull has --rebase since
they only work with it but could not figure out how to do that
and the error message of doing git pull --autostash points out
that you need --rebase so i guess it's good enough

Signed-off-by: Albert Astals Cid &lt;albert.astals.cid@kdab.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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`	`"`