author | Wincent Colaiuta <win@wincent.com> | |
Thu, 13 Dec 2007 13:32:30 +0000 (14:32 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 14 Dec 2007 07:43:58 +0000 (23:43 -0800) | ||
commit | 45e2a4b2b0a07cda05dda08b47906100c4711e4e | |
tree | 6054aa81f13785dcf7869cd0340ecd5a2083aa04 | tree | snapshot |
parent | c1795bb08aae9fb7e4dc1a01e292b85e59b1c640 | commit | diff |
Make "diff --check" output match "git apply"
For consistency, make the two tools report whitespace errors in the
same way (the output of "diff --check" has been tweaked to match
that of "git apply").
Note that although the textual content is basically the same only
"git diff --check" provides a colorized version of the problematic
lines; making "git apply" do colorization will require more extensive
changes (figuring out the diff colorization preferences of the user)
and so that will be a subject for another commit.
Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
For consistency, make the two tools report whitespace errors in the
same way (the output of "diff --check" has been tweaked to match
that of "git apply").
Note that although the textual content is basically the same only
"git diff --check" provides a colorized version of the problematic
lines; making "git apply" do colorization will require more extensive
changes (figuring out the diff colorization preferences of the user)
and so that will be a subject for another commit.
Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-apply.c | diff | blob | history | |
diff.c | diff | blob | history |