]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7064994 0c3ef98)
Merge branch 'bg/apply-blank-trailing-context' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:38:36 +0000 (05:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:38:36 +0000 (05:38 -0700)
* bg/apply-blank-trailing-context:
  apply: Allow blank *trailing* context lines to match beyond EOF

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

diff --cc builtin/apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.