summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-21 05:38:36 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-21 05:38:36 -0700
commite1ba0f6340c1d72677c7792a0a82ecf05363026e (patch)
treef298b749b5dbdc6e1e3d639da3950c3287f2a81a /git-pull.sh
parent70649945c215b1674611a40eda1d0058118a6d1a (diff)
parent0c3ef984fa2d4a42be787e168cfb189d15b00919 (diff)
downloadgit-e1ba0f6340c1d72677c7792a0a82ecf05363026e.tar.gz
Merge branch 'bg/apply-blank-trailing-context' into maint
* bg/apply-blank-trailing-context: apply: Allow blank *trailing* context lines to match beyond EOF
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions