From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:16:05 +0000 (-0800)
Subject: Merge branch 'pw/completion-show-branch'
X-Git-Tag: v2.8.0-rc0~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/47c33b45d1a92afa2b58682601457609abbb1ed4?ds=inline;hp=-c

Merge branch 'pw/completion-show-branch'

* pw/completion-show-branch:
completion: complete show-branch "--date-order"
---

47c33b45d1a92afa2b58682601457609abbb1ed4
diff --combined contrib/completion/git-completion.bash
index 800e0bb1af,0b7f4dd6f1..8e783eacf1
--- 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)
@@@ -2373,7 -2368,7 +2373,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