From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Feb 2016 18:27:24 +0000 (-0800)
Subject: Merge branch 'pw/completion-stash'
X-Git-Tag: v2.8.0-rc0~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8716bdca268d9fb1cc9fc0255bfcbb27ace7e5b5?hp=-c

Merge branch 'pw/completion-stash'

* pw/completion-stash:
completion: fix mis-indentation in _git_stash()
---

8716bdca268d9fb1cc9fc0255bfcbb27ace7e5b5
diff --combined contrib/completion/git-completion.bash
index 45ec47f2b1,02a0489c00..e3918c87e3
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1169,7 -1169,7 +1169,7 @@@ __git_diff_common_options="--stat --num
  			--no-prefix --src-prefix= --dst-prefix=
  			--inter-hunk-context=
  			--patience --histogram --minimal
 -			--raw --word-diff
 +			--raw --word-diff --word-diff-regex=
  			--dirstat --dirstat= --dirstat-by-file
  			--dirstat-by-file= --cumulative
  			--diff-algorithm=
@@@ -1312,7 -1312,6 +1312,7 @@@ _git_grep (
  			--full-name --line-number
  			--extended-regexp --basic-regexp --fixed-strings
  			--perl-regexp
 +			--threads
  			--files-with-matches --name-only
  			--files-without-match
  			--max-depth
@@@ -1688,12 -1687,8 +1688,12 @@@ _git_rebase (
  			--preserve-merges --stat --no-stat
  			--committer-date-is-author-date --ignore-date
  			--ignore-whitespace --whitespace=
 -			--autosquash --fork-point --no-fork-point
 -			--autostash
 +			--autosquash --no-autosquash
 +			--fork-point --no-fork-point
 +			--autostash --no-autostash
 +			--verify --no-verify
 +			--keep-empty --root --force-rebase --no-ff
 +			--exec
  			"
  
  		return
@@@ -1813,7 -1808,7 +1813,7 @@@ _git_config (
  		return
  		;;
  	branch.*.rebase)
 -		__gitcomp "false true"
 +		__gitcomp "false true preserve interactive"
  		return
  		;;
  	remote.pushdefault)
@@@ -2060,7 -2055,6 +2060,7 @@@
  		core.sparseCheckout
  		core.symlinks
  		core.trustctime
 +		core.untrackedCache
  		core.warnAmbiguousRefs
  		core.whitespace
  		core.worktree
@@@ -2374,7 -2368,7 +2374,7 @@@ _git_show_branch (
  	case "$cur" in
  	--*)
  		__gitcomp "
 -			--all --remotes --topo-order --current --more=
 +			--all --remotes --topo-order --date-order --current --more=
  			--list --independent --merge-base --no-name
  			--color --no-color
  			--sha1-name --sparse --topics --reflog
@@@ -2415,8 -2409,8 +2415,8 @@@ _git_stash (
  		show,--*|branch,--*)
  			;;
  		branch,*)
- 		  if [ $cword -eq 3 ]; then
- 			__gitcomp_nl "$(__git_refs)";
+ 			if [ $cword -eq 3 ]; then
+ 				__gitcomp_nl "$(__git_refs)";
  			else
  				__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
  						| sed -n -e 's/:.*//p')"