| commit | 6fc944d8956bf75bf2e52a871c02b71b4f9dfcba | |
| author | Sergey Organov <sorganov@gmail.com> | |
| Mon, 21 Dec 2020 15:19:45 +0000 (21 18:19 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Dec 2020 21:47:31 +0000 (21 13:47 -0800) | ||
| tree | f14539c4165b7440c969453102f8f5c55e8be020 | treesnapshot (tar.gz zip) |
| parent | ec315c66bb73e26542b7b3de8abaffa310c4380e | commitdiff |
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff-merges.c | diffblobblamehistory | |
| t/t4013-diff-various.sh | diffblobblamehistory |