user/sven/git.git/diff.h, branch v1.4.4.4

Merge branch 'jc/pickaxe'

2006-11-08T00:33:59Z

git-pickaxe: rename detection optimization

2006-11-04T20:18:12Z

The idea is that we are interested in renaming into only one path, so we do not care about renames that happen elsewhere. Signed-off-by: Junio C Hamano

Make git-cherry handle root trees

2006-10-27T01:31:17Z

This patch on top of 'next' makes built-in git-cherry handle root commits. It moves the static function log-tree.c::diff_root_tree() to tree-diff.c and makes it more similar to diff_tree_sha1() by shuffling around arguments and factoring out the call to log_tree_diff_flush(). Consequently the name is changed to diff_root_tree_sha1(). It is a version of diff_tree_sha1() that compares the empty tree (= root tree) against a single 'real' tree. This function is then used in get_patch_id() to compute patch IDs for initial commits instead of SEGFAULTing, as the current code does if confronted with parentless commits. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

diff --numstat

2006-10-14T04:37:10Z

[jc: with documentation from Jakub] Signed-off-by: Junio C Hamano

Merge branch 'jc/diff-stat'

2006-10-01T04:29:18Z

* jc/diff-stat: diff --stat: ensure at least one '-' for deletions, and one '+' for additions diff --stat=width[,name-width]: allow custom diffstat output width. diff --stat: color output. diff --stat: allow custom diffstat output width.

diff --stat: allow custom diffstat output width.

2006-09-27T09:55:08Z

This adds two parameters to "diff --stat". . --stat-width=72 tells that the page should fit on 72-column output. . --stat-name-width=30 tells that the filename part is limited to 30 columns. Signed-off-by: Junio C Hamano

diff.c: second war on whitespace.

2006-09-24T07:12:44Z

This adds DIFF_WHITESPACE color class (default = reverse red) to colored diff output to let you catch common whitespace errors. - trailing whitespaces at the end of line - a space followed by a tab in the indent Signed-off-by: Junio C Hamano

diff: support custom callbacks for output

2006-09-07T22:40:25Z

Users can request the DIFF_FORMAT_CALLBACK output format to get a callback consisting of the whole diff_queue_struct. Signed-off-by: Junio C Hamano

Add the --color-words option to the diff options family

2006-08-10T22:28:57Z

With this option, the changed words are shown inline. For example, if a file containing "This is foo" is changed to "This is bar", the diff will now show "This is " in plain text, "foo" in red, and "bar" in green. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Colorize 'commit' lines in log ui

2006-07-24T07:04:41Z

When paging through the output of git-whatchanged, the color cues help to visually navigate within a diff. However, it is difficult to notice when a new commit starts, because the commit and log are shown in the "normal" color. This patch colorizes the 'commit' line, customizable through diff.colors.commit and defaulting to yellow. As a side effect, some of the diff color engine (slot enum, get_color) has become accessible outside of diff.c. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano