git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71f19cc 0a80bc9)
Merge branch 'jc/apply-ws-fix-expands-report'
authorJunio C Hamano <redacted>
Tue, 3 Mar 2015 22:37:02 +0000 (14:37 -0800)
committerJunio C Hamano <redacted>
Tue, 3 Mar 2015 22:37:02 +0000 (14:37 -0800)
"git apply --whitespace=fix" fixed whitespace errors in the common
context lines but did so without reporting.

* jc/apply-ws-fix-expands-report:
  apply: detect and mark whitespace errors in context lines when fixing

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

diff --cc builtin/apply.c
Simple merge
git clone https://git.99rst.org/PROJECT