From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Jun 2013 15:46:23 +0000 (-0700)
Subject: Merge branch 'rr/complete-difftool-fixup'
X-Git-Tag: v1.8.4-rc0~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdff0e3a374617dce784f801b97500d9ba2e4705;p=thirdparty%2Fgit.git

Merge branch 'rr/complete-difftool-fixup'

"git difftool" can take both revs to be compared and pathspecs.
"git show" takes revs, revs:path and pathspecs.

* rr/complete-difftool-fixup:
  completion: show can take both revlist and paths
  completion: difftool takes both revs and files
---

bdff0e3a374617dce784f801b97500d9ba2e4705