git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec315c6)
diff-merges: fix -m to properly override -c/--cc
authorSergey Organov <redacted>
Mon, 21 Dec 2020 15:19:45 +0000 (18:19 +0300)
committerJunio C Hamano <redacted>
Mon, 21 Dec 2020 21:47:31 +0000 (13:47 -0800)
commit6fc944d8956bf75bf2e52a871c02b71b4f9dfcba
treef14539c4165b7440c969453102f8f5c55e8be020tree | snapshot
parentec315c66bb73e26542b7b3de8abaffa310c4380ecommit | diff
diff-merges: fix -m to properly override -c/--cc

Logically, -m, -c, --cc specify 3 different formats for representing
merge commits, yet -m doesn't in fact override -c or --cc, that makes
no sense.

Fix -m to properly override -c/--cc, and change the tests accordingly.

Signed-off-by: Sergey Organov <redacted>
Signed-off-by: Junio C Hamano <redacted>
diff-merges.c diff | blob | history
t/t4013-diff-various.sh diff | blob | history
git clone https://git.99rst.org/PROJECT