user/sven/git.git/diff.h, branch v1.0rc1

Documentation changes to recursive option for git-diff-tree

2005-10-28T20:37:38Z

Update docs and usages regarding '-r' recursive option for git-diff-tree. Remove '-r' from common diff options, mention it only for git-diff-tree. Remove one extraneous use of '-r' with git-diff-files in get-merge.sh. Sync the synopsis and usage string for git-diff-tree. Signed-off-by: Chris Shoemaker Signed-off-by: Junio C Hamano

Split up tree diff functions into tree-diff.c library

2005-10-23T05:49:51Z

This makes the tree diff functionality independent of the "git-diff-tree" program, by splitting the core functionality up into a library file. This will be needed for when we teach git-rev-list to only follow a specified set of pathnames, rather than the global revision history. Most of it is a fairly straightforward code move, but it also involves some calling convention cleanup, and moving some of the static variables from diff-tree.c into the options structure. The actual tree change callback routines also become paramterized by the diff_options structure, allowing the library functionality to do something else than just show the diff on stdout. Right now the only user of this functionality remains git-diff-tree itself. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Fix diff-filter All-Or-None mark.

2005-10-05T00:44:17Z

When we updated the marker for new files from 'N' to 'A', we forgot to notice that the letter is already taken by the All-Or-None mark. Change the All-Or-None marker to '*' to resolve this conflict. git-diff-tree -r --diff-filter='R*' -M shows all the changes (not just renames) that are contained in commits that have renames, in comparison with: git-diff-tree -r --diff-filter='R' -M shows the same set of changes but the diff output are limited only to renaming changes. Signed-off-by: Junio C Hamano

Diff: --name-status output format.

2005-09-25T06:50:44Z

The new output format shows only the status letter and paths. Signed-off-by: Junio C Hamano

Diff: -l to limit rename/copy detection.

2005-09-25T06:50:44Z

When many paths are modified, rename detection takes a lot of time. The new option -l can be used to disable rename detection when more than paths are possibly created as renames. Signed-off-by: Junio C Hamano

Diff clean-up.

2005-09-25T06:50:43Z

This is a long overdue clean-up to the code for parsing and passing diff options. It also tightens some constness issues. Signed-off-by: Junio C Hamano

Retire diff-helper.

2005-09-22T08:54:13Z

The textual diff generation with built-in '-p' in diff-* brothers has proven to be useful enough that git-diff-helper outlived its usefulness. Signed-off-by: Junio C Hamano

diff-raw: Use 'A' instead of 'N' for added files.

2005-07-26T00:16:20Z

This actually changes the diff-raw status letter from N to A for added files. Signed-off-by: Junio C Hamano

Use symbolic constants for diff-raw status indicators.

2005-07-26T00:15:34Z

Both Cogito and StGIT prefer to see 'A' for new files. The current 'N' is visually harder to distinguish from 'M', which is used for modified files. Prepare the internals to use symbolic constants to make the change easier. Signed-off-by: Junio C Hamano

Split up "diff_format" into "format" and "line_termination".

2005-07-15T00:59:17Z

This removes the separate "formats" for name and name-with-zero- termination. It also removes the difference between HUMAN and MACHINE formats, and they both become DIFF_FORMAT_RAW, with the difference being just in the line and inter-filename termination. It also makes the code easier to understand.