Matt McCutchen dbc2fb6b84 "git diff <tree>{3,}": do not reverse order of arguments ... According to the message of commit 0fe7c1de16, "git diff" with three or more trees expects the merged tree first followed by the parents, in order. However, this command reversed the order of its arguments, resulting in confusing diffs. A comment /* Again, the revs are all reverse */ suggested there was a reason for this, but I can't figure out the reason, so I removed the reversal of the arguments. Test case included. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2008-12-07 14:57:57 -08:00
..
diff.config_format.subjectprefix_DIFFERENT_PREFIX	format-patch: Add format.subjectprefix config option	2007-07-02 21:05:45 -07:00
diff.diff-tree_--cc_--patch-with-stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_--cc_--patch-with-stat_--summary_side
diff.diff-tree_--cc_--patch-with-stat_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_--cc_--stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_--cc_--stat_--summary_side
diff.diff-tree_--cc_--stat_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_--cc_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_--patch-with-raw_initial
diff.diff-tree_--patch-with-stat_initial
diff.diff-tree_--pretty=oneline_--patch-with-raw_initial
diff.diff-tree_--pretty=oneline_--patch-with-stat_initial
diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial
diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
diff.diff-tree_--pretty=oneline_--root_-p_initial
diff.diff-tree_--pretty=oneline_--root_initial
diff.diff-tree_--pretty=oneline_-p_initial
diff.diff-tree_--pretty=oneline_initial
diff.diff-tree_--pretty_--patch-with-raw_initial
diff.diff-tree_--pretty_--patch-with-stat_initial
diff.diff-tree_--pretty_--patch-with-stat_side
diff.diff-tree_--pretty_--root_--patch-with-raw_initial
diff.diff-tree_--pretty_--root_--patch-with-stat_initial
diff.diff-tree_--pretty_--root_--stat_--summary_initial
diff.diff-tree_--pretty_--root_--stat_initial
diff.diff-tree_--pretty_--root_--summary_-r_initial	t4013: note improvements brought by the new output code.	2006-06-29 12:07:27 -07:00
diff.diff-tree_--pretty_--root_--summary_initial	Turn on recursive with --summary	2006-10-05 15:10:40 -07:00
diff.diff-tree_--pretty_--root_-p_initial
diff.diff-tree_--pretty_--root_initial
diff.diff-tree_--pretty_--stat_--summary_initial
diff.diff-tree_--pretty_--stat_initial
diff.diff-tree_--pretty_--summary_initial
diff.diff-tree_--pretty_-p_initial
diff.diff-tree_--pretty_-p_side
diff.diff-tree_--pretty_initial
diff.diff-tree_--pretty_side
diff.diff-tree_--root_--abbrev_initial
diff.diff-tree_--root_--patch-with-raw_initial
diff.diff-tree_--root_--patch-with-stat_initial
diff.diff-tree_--root_-p_initial
diff.diff-tree_--root_-r_--abbrev=4_initial
diff.diff-tree_--root_-r_--abbrev_initial
diff.diff-tree_--root_-r_initial
diff.diff-tree_--root_initial
diff.diff-tree_-c_--abbrev_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_-c_--stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_-c_--stat_--summary_side
diff.diff-tree_-c_--stat_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_-c_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_-p_-m_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.diff-tree_-p_initial
diff.diff-tree_-p_master
diff.diff-tree_-r_--abbrev=4_initial
diff.diff-tree_-r_--abbrev_initial
diff.diff-tree_-r_initial
diff.diff-tree_initial
diff.diff-tree_master
diff.diff_--abbrev_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_--name-status_dir2_dir	"git diff": do not ignore index without --no-index	2008-05-24 00:16:39 -07:00
diff.diff_--no-index_--name-status_dir2_dir	"git diff": do not ignore index without --no-index	2008-05-24 00:16:39 -07:00
diff.diff_--patch-with-raw_-r_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_--patch-with-raw_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_--patch-with-stat_-r_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_--patch-with-stat_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_--stat_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_-r_--stat_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_-r_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_initial..side	t4013: add "diff" UI program tests.	2006-07-01 22:02:17 -07:00
diff.diff_master_master^_side	"git diff <tree>{3,}": do not reverse order of arguments	2008-12-07 14:57:57 -08:00
diff.format-patch_--attach_--stdout_initial..master	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--attach_--stdout_initial..master^	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--attach_--stdout_initial..side	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--inline_--stdout_initial..master	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--inline_--stdout_initial..master^	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--inline_--stdout_initial..master^^	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--inline_--stdout_initial..side	format-patch: Produce better output with --inline or --attach	2008-07-29 23:18:15 -07:00
diff.format-patch_--stdout_--cover-letter_-n_initial..master^	format-patch: wrap cover-letter's shortlog sensibly	2008-03-02 15:27:27 -08:00
diff.format-patch_--stdout_initial..master	Add --summary to git-format-patch by default	2007-01-17 23:48:20 -08:00
diff.format-patch_--stdout_initial..master^	Add --summary to git-format-patch by default	2007-01-17 23:48:20 -08:00
diff.format-patch_--stdout_initial..side	Add --summary to git-format-patch by default	2007-01-17 23:48:20 -08:00
diff.log_--patch-with-stat_--summary_master_--_dir_	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--patch-with-stat_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--patch-with-stat_master_--_dir_	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--root_--cc_--patch-with-stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--root_--patch-with-stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--root_--patch-with-stat_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--root_-c_--patch-with-stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--root_-p_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_--root_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_-p_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_-SF_-p_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.log_-SF_master	Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT	2007-10-15 20:24:27 -04:00
diff.log_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.show_--patch-with-raw_side
diff.show_--patch-with-stat_--summary_side
diff.show_--patch-with-stat_side
diff.show_--root_initial
diff.show_--stat_--summary_side
diff.show_--stat_side
diff.show_initial
diff.show_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.show_side
diff.whatchanged_--patch-with-stat_--summary_master_--_dir_	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--patch-with-stat_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--patch-with-stat_master_--_dir_	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--root_--patch-with-stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--root_--patch-with-stat_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--root_-c_--patch-with-stat_--summary_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--root_-p_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_--root_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_-p_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_-SF_-p_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_-SF_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00
diff.whatchanged_master	t4013 diff format tests update	2006-07-13 21:40:43 -07:00