summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorLibravatar Björn Gustavsson <bgustavsson@gmail.com>2010-04-08 06:14:31 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-07 23:46:23 -0700
commit0c3ef984fa2d4a42be787e168cfb189d15b00919 (patch)
treed6e076b15020477dad29a433c0212268f49511d5 /Documentation/git-reset.txt
parentt3417: Add test cases for "rebase --whitespace=fix" (diff)
downloadtgif-0c3ef984fa2d4a42be787e168cfb189d15b00919.tar.xz
apply: Allow blank *trailing* context lines to match beyond EOF
In 51667147be, "git apply --whitespace=fix" was extended to allow a blank context line to match beyond the end of the file, but only if the context line was in the leading part of the hunk (i.e. the hunk inserted additional contents at the end of the file). Drop the restriction that the context line must be in the leading part of the hunk, thus allowing a file to be changed from: a (blank line) to: b a (blank line) Note that the blank line will be kept, because "--whitespace=fix" only removes trailing blank lines that a hunk would add, never trailing blank lines in the context. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
0 files changed, 0 insertions, 0 deletions