diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-25 12:16:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-25 16:50:00 -0800 |
| commit | 3ce8f08944e614813c7dfb212a88b7c4e3b443bc (patch) | |
| tree | 0ea80c1ceb83a898851ff8d097db9a5b157e0189 /mozilla-sha1 | |
| parent | builtin-diff: \No newline at end of file. (diff) | |
| download | tgif-3ce8f08944e614813c7dfb212a88b7c4e3b443bc.tar.xz | |
built-in diff: minimum tweaks
This fixes up a couple of minor issues with the real built-in
diff to be more usable:
- Omit ---/+++ header unless we emit diff output;
- Detect and punt binary diff like GNU does;
- Honor GIT_DIFF_OPTS minimally (only -u<number> and
--unified=<number> are currently supported);
- Omit line count of 1 from "@@ -l,k +m,n @@" hunk header
(i.e. when k == 1 or n == 1)
- Adjust testsuite for the lack of -p support.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'mozilla-sha1')
0 files changed, 0 insertions, 0 deletions