projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 908b360 5269f7f)
Merge branch 'rr/complete-difftool-fixup'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:46:23 +0000 (08:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:46:23 +0000 (08:46 -0700)
commitbdff0e3a374617dce784f801b97500d9ba2e4705
treeb4d969695a5ee49e325b535ea9742c0cf819c4fbtree | snapshot
parent908b3601e67e21996c1df5807761f42dcd72c2c5commit | diff
parent5269f7f8c6b293f1568c4f03c14596835e22df31commit | diff
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
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.