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=-c

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
---

00bcc35081f6fd247fa4024bd256c1ab4082f9bf
diff --combined contrib/completion/git-completion.bash
index 35df6ce9ea,be9cf0acc0..3683c772c5
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1204,7 -1204,7 +1204,7 @@@ _git_branch (
  			--color --no-color --verbose --abbrev= --no-abbrev
  			--track --no-track --contains --no-contains --merged --no-merged
  			--set-upstream-to= --edit-description --list
 -			--unset-upstream --delete --move --remotes
 +			--unset-upstream --delete --move --copy --remotes
  			--column --no-column --sort= --points-at
  			"
  		;;
@@@ -1400,7 -1400,7 +1400,7 @@@ __git_diff_common_options="--stat --num
  			--patch-with-stat --name-only --name-status --color
  			--no-color --color-words --no-renames --check
  			--full-index --binary --abbrev --diff-filter=
 -			--find-copies-harder
 +			--find-copies-harder --ignore-cr-at-eol
  			--text --ignore-space-at-eol --ignore-space-change
  			--ignore-all-space --ignore-blank-lines --exit-code
  			--quiet --ext-diff --no-ext-diff
@@@ -1922,6 -1922,7 +1922,7 @@@ _git_pull (
  	--*)
  		__gitcomp "
  			--rebase --no-rebase
+ 			--autostash --no-autostash
  			$__git_merge_options
  			$__git_fetch_options
  		"
@@@ -2641,7 -2642,6 +2642,7 @@@ _git_config (
  		sendemail.suppressfrom
  		sendemail.thread
  		sendemail.to
 +		sendemail.tocmd
  		sendemail.validate
  		sendemail.smtpbatchsize
  		sendemail.smtprelogindelay