projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ba9ea9 d69dc37)
Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:53:06 +0000 (16:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:53:06 +0000 (16:53 -0700)
* master:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk
  count-delta: match get_delta_hdr_size() changes.
  check patch_delta bounds more carefully


Trivial merge
The core git plumbing