projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce18135 c5a4c4d)
Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:52:59 +0000 (16:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:52:59 +0000 (16:52 -0700)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk


Trivial merge
The core git plumbing