From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Feb 2016 22:54:16 +0000 (-0800)
Subject: Merge branch 'pw/completion-show-branch' into maint
X-Git-Tag: v2.7.1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39abb2ed483a540676b9fb207409971a566d9979?ds=inline;hp=-c

Merge branch 'pw/completion-show-branch' into maint

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

39abb2ed483a540676b9fb207409971a566d9979
diff --combined contrib/completion/git-completion.bash
index 5cec0ee3cc,0b7f4dd6f1..11bf827fc3
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1687,12 -1687,8 +1687,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
@@@ -2372,7 -2368,7 +2372,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