Merge branch 'rr/complete-difftool' into next
commit01c761103a074d2702c0ab56ddce33f8fa937f02
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jun 2013 22:27:18 +0000 (4 15:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jun 2013 22:27:18 +0000 (4 15:27 -0700)
tree0b05e478cbfbb1ba070e744587b2567b5bf1ce54
parentbebedca1a9325b669a7428e4a11443427246db5f
parent77c13052a0f94ccb96da6ad89c0e3805bf5302e4
Merge branch 'rr/complete-difftool' into next

* rr/complete-difftool:
  completion: clarify ls-tree, archive, show completion
  completion: difftool takes both revs and files
contrib/completion/git-completion.bash