author | Junio C Hamano <junkio@cox.net> | |
Thu, 9 Feb 2006 23:23:06 +0000 (15:23 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 9 Feb 2006 23:23:06 +0000 (15:23 -0800) | ||
commit | 0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1 | |
tree | 6438c7d0bcffa9ed3413a436378677a9e105f87e | tree | snapshot |
parent | 5b23683251801381a17b5c3e82940c268821681c | commit | diff |
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>
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>
combine-diff.c | diff | blob | history | |
diff-files.c | diff | blob | history | |
diff-tree.c | diff | blob | history | |
diff.h | diff | blob | history |