projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cf7a64b 4a689af)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
commit38a5932be8a8f0b0bd3bb949bdc5258d9c753f15
tree988476312dea85d849b00b42b812f626bd7dbf29tree | snapshot
parentcf7a64b54afe28ff61b362abc04399de383977e0commit | diff
parent4a689afb030c1cd5aa1c141db94bbf9dde42f05ecommit | diff
Merge branch 'maint'

* maint:
  difftool: provide basename to external tools
  git-difftool.txt: correct the description of $BASE and describe $MERGED
Documentation/git-difftool.txt diff1 | diff2 | blob | history
Git—the stupid content tracker