Merge branch 'pw/completion-show-branch' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:16 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:16 +0000 (14:54 -0800)
* pw/completion-show-branch:
completion: complete show-branch "--date-order"

1  2 
contrib/completion/git-completion.bash
index 5cec0ee3cccfadd2dfcaf134d537acfcc3a61230,0b7f4dd6f14756a0c0864e2e7ceadde272faf516..11bf827fc37ab3d1820b0c568b1d9e67fc71fa3c
@@@ -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