projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2110c8 55846b9)
Merge branch 'tr/maint-merge-file-subdir'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:00:56 +0000 (15:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:00:56 +0000 (15:00 -0800)
* tr/maint-merge-file-subdir:
  merge-file: correctly find files when called in subdir
  prefix_filename(): safely handle the case where pfx_len=0


Trivial merge
Git—the stupid content tracker