projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5605685 aae1f6a)
Merge branch 'fc/apply-p2-get-header-name' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:36 +0000 (10:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:36 +0000 (10:36 -0800)
* fc/apply-p2-get-header-name:
  test: git-apply -p2 rename/chmod only
  Fix git-apply with -p greater than 1

1  2 
builtin/apply.c patch | diff1 | diff2 | blob | history

diff --cc builtin/apply.c
Simple merge
Git—the stupid content tracker