Merge branch 'master' into next
commit06c29dc5775bfd65329e6072358821bb781a6deb
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Apr 2013 17:46:39 +0000 (29 10:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Apr 2013 17:46:39 +0000 (29 10:46 -0700)
tree84b0b1f4885e6aa9493341c194d62d2c43eaea9e
parenta167d3e67985022ba4585108a4af4a951e5e7f54
parent7e6a0cc47da79dd22c0338aee8750fda92ced5d9
Merge branch 'master' into next

* master:
  git-completion.bash: add remote.pushdefault to config list
  git-completion.bash: add branch.*.pushremote to config list
  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