aboutsummaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-09 15:23:06 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-09 15:23:06 -0800
commit0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1 (patch)
tree6438c7d0bcffa9ed3413a436378677a9e105f87e /diff-tree.c
parent5b23683251801381a17b5c3e82940c268821681c (diff)
downloadgit-0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1.tar.gz
git-0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1.tar.xz
combine-diff: move formatting logic to show_combined_diff()
This way, diff-files can make use of it. Also implement the full suite of what diff_flush_raw() supports just for consistency. With this, 'diff-tree -c -r --name-status' would show what is expected. There is no way to get the historical output (useful for debugging and low-level Plumbing work) anymore, so tentatively it makes '-m' to mean "do not combine and show individual diffs with parents". diff-files matches diff-tree to produce raw output for -c. For textual combined diff, use -p -c. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-tree.c')
-rw-r--r--diff-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c
index df6fd97fc..b170b03fd 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -248,7 +248,7 @@ int main(int argc, const char **argv)
continue;
}
if (!strcmp(arg, "-m")) {
- ignore_merges = 0;
+ combine_merges = ignore_merges = 0;
continue;
}
if (!strcmp(arg, "-c")) {