From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:23:37 +0000 (-0800)
Subject: Merge branch 'ac/complete-pull-autostash'
X-Git-Tag: v2.16.0-rc0~80
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/00bcc35081f6fd247fa4024bd256c1ab4082f9bf?hp=6cddb7362ca3c7312b57a4f172bca5c953a45b6c

Merge branch 'ac/complete-pull-autostash'

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
index 35df6ce9ea..3683c772c5 100644
--- 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
 		"