projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a2c641c) | patch
git-diff: do not fall back on --cc when -[123], --ours etc. are given.
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 19:17:56 +0000 (11:17 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 19:22:07 +0000 (11:22 -0800)
commitf22fd75c6a39a72d6bf20786ba889fb73038bec9
tree3381e92a4619c130706d7777c37803d040df57f0tree | snapshot
parenta2c641c4ab66b5bdcb62c36a5f748b9f929d61b8commit | diff
git-diff: do not fall back on --cc when -[123], --ours etc. are given.

These flags ask diff with a specific unmerged stage, so it
should fall back on -p instead.  Also when -c is given, we
should not do --cc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-diff.sh diff | blob | history
The core git plumbing