diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:23:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:23:50 -0700 |
commit | 7b676b1bb53c936770a07354ec6c6550fb31b421 (patch) | |
tree | ee46af290fec7e3bdf30b5759a887928c9a15147 /git.c | |
parent | Documentation: explain the meaning of "-g" in git-describe output (diff) | |
parent | t3417: Add test cases for "rebase --whitespace=fix" (diff) | |
download | tgif-7b676b1bb53c936770a07354ec6c6550fb31b421.tar.xz |
Merge branch 'bg/apply-fix-blank-at-eof' into maint
* bg/apply-fix-blank-at-eof:
t3417: Add test cases for "rebase --whitespace=fix"
t4124: Add additional tests of --whitespace=fix
apply: Allow blank context lines to match beyond EOF
apply: Remove the quick rejection test
apply: Don't unnecessarily update line lengths in the preimage
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions