Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Apr 2013 16:57:38 +0000 (09:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Apr 2013 16:57:38 +0000 (09:57 -0700)
commit01449e314f383861f053786129120abdbeac3198
treef3ab44d855c7fc52286d87f93fd70a3273284996
parent89740333e8d398f1da701e9023675321bbb9a85b
parent8301b976ed461b5ab3b79a1ce0da1c13728e8149
Merge branch 'maint'

* maint:
  complete: zsh: use zsh completion for the main cmd
  complete: zsh: trivial simplification
  git-completion.bash: complete branch.*.rebase as boolean
  git-completion.bash: add diff.submodule to config list
  git-completion.bash: lexical sorting for diff.statGraphWidth
contrib/completion/git-completion.bash