git/diff-tree.c, branch v0.99

git-diff-*: support "-u" as a synonym for "-p"

2005-07-08T17:45:07Z

I'm probably not the only one whose fingers have gotten hard-wired to use "-u" for "unified diff".

Add "--pretty=full" format that also shows committer.

2005-06-27T00:50:46Z

Also move the common implementation of parsing the --pretty argument format into commit.c rather than having duplicates in diff-tree.c and rev-list.c.

Clean up git-diff-tree 'header' generation

2005-06-23T20:56:55Z

[PATCH] Make -C less eager.

2005-06-20T03:13:18Z

Like diff-tree, this patch makes -C option for diff-* brothers to use only pre-image of modified files as rename/copy detection by default. Give --find-copies-harder to use unmodified files to find copies from as well. This also fixes "diff-files -C" problem earlier noticed by Linus. It was feeding the null sha1 even when the file in the work tree was known to match what is in the index file. This resulted in diff-files showing everything in the project. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Add --diff-filter= output restriction to diff-* family.

2005-06-13T03:40:20Z

This is a halfway between debugging aid and a helper to write an ultra-smart merge scripts. The new option takes a string that consists of a list of "status" letters, and limits the diff output to only those classes of changes, with two exceptions: - A broken pair (aka "complete rewrite"), does not match D (deleted) or N (created). Use B to look for them. - The letter "A" in the diff-filter string does not match anything itself, but causes the entire diff that contains selected patches to be output (this behaviour is similar to that of --pickaxe-all for the -S option). For example, $ git-rev-list HEAD | git-diff-tree --stdin -s -v -B -C --diff-filter=BCR shows a list of commits that have complete rewrite, copy, or rename. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] diff-tree: --find-copies-harder

2005-06-13T03:40:20Z

Normally, diff-tree does not feed unchanged filepair to diffcore for performance reasons, so copies are detected only when the source file of the copy happens to be modified in the same changeset. This adds --find-copies-harder flag to tell diff-tree to sacrifice the performance in order to find copies the same way as other commands in diff-* family. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

git-diff-tree: fix output with just "--pretty".

2005-06-13T03:34:09Z

It set verbose, but didn't set the output prefix to "diff-tree".

[PATCH] Support commit_format in diff-tree

2005-06-13T03:29:31Z

This steals --pretty command line option from rev-list and teaches diff-tree to do the same. With this change, $ git-whatchanged --pretty would work as expected. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

pretty_print_commit: add different formats

2005-06-05T16:02:03Z

You can ask to print out "raw" format (full headers, full body), "medium" format (author and date, full body) or "short" format (author only, condensed body). Use "git-rev-list --pretty=short HEAD | less -S" for an example.

[PATCH] diff: Clean up diff_scoreopt_parse().

2005-06-03T18:23:03Z

This cleans up diff_scoreopt_parse() function that is used to parse the fractional notation -B, -C and -M option takes. The callers are modified to check for errors and complain. Earlier they silently ignored malformed input and falled back on the default. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds