diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-06 11:17:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-06 11:22:07 -0800 |
| commit | f22fd75c6a39a72d6bf20786ba889fb73038bec9 (patch) | |
| tree | 3381e92a4619c130706d7777c37803d040df57f0 /combine-diff.c | |
| parent | a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8 (diff) | |
| download | git-f22fd75c6a39a72d6bf20786ba889fb73038bec9.tar.gz | |
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>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions