diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-10-17 00:11:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-17 00:11:03 -0700 |
commit | 9981c808b4b9307d58cedddd17689c2313a0d34a (patch) | |
tree | 4646517a38a111cd0b2e565ecb20dfaf9f59e8b3 /merge-recursive.c | |
parent | Merge branch 'maint' (diff) | |
parent | Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eof (diff) | |
download | tgif-9981c808b4b9307d58cedddd17689c2313a0d34a.tar.xz |
Merge branch 'jc/maint-blank-at-eof'
* jc/maint-blank-at-eof:
diff -B: colour whitespace errors
diff.c: emit_add_line() takes only the rest of the line
diff.c: split emit_line() from the first char and the rest of the line
diff.c: shuffling code around
diff --whitespace: fix blank lines at end
core.whitespace: split trailing-space into blank-at-{eol,eof}
diff --color: color blank-at-eof
diff --whitespace=warn/error: fix blank-at-eof check
diff --whitespace=warn/error: obey blank-at-eof
diff.c: the builtin_diff() deals with only two-file comparison
apply --whitespace: warn blank but not necessarily empty lines at EOF
apply --whitespace=warn/error: diagnose blank at EOF
apply.c: split check_whitespace() into two
apply --whitespace=fix: detect new blank lines at eof correctly
apply --whitespace=fix: fix handling of blank lines at the eof
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions