From 4abd89648eb40384556e2118e74be03325d0b05d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Feb 2006 16:36:12 -0800 Subject: [PATCH] diff-index: make --cc a synonym for -p for now. It could be made later to show unmerged state nicer than the default as we did for diff-files later, but this would suffice for now. We would like to make --cc the default for 'git diff'. Signed-off-by: Junio C Hamano --- diff-index.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/diff-index.c b/diff-index.c index bbd873ba..f8a102ec 100644 --- a/diff-index.c +++ b/diff-index.c @@ -201,6 +201,14 @@ int main(int argc, const char **argv) /* We accept the -r flag just to look like git-diff-tree */ continue; } + if (!strcmp(arg, "--cc")) + /* + * I _think_ "diff-index --cached HEAD" with an + * unmerged index could show something else + * later, but pretend --cc is the same as -p for + * now. "git diff" uses --cc by default. + */ + argv[i] = arg = "-p"; diff_opt_cnt = diff_opt_parse(&diff_options, argv + i, argc - i); if (diff_opt_cnt < 0) -- 2.11.0