From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Oct 2009 07:11:03 +0000 (-0700)
Subject: Merge branch 'jc/maint-blank-at-eof'
X-Git-Tag: v1.6.6-rc0~125
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9981c808b4b9307d58cedddd17689c2313a0d34a;p=git.git

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
---

9981c808b4b9307d58cedddd17689c2313a0d34a