mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-merges: fix -m to properly override -c/--cc

Browse Source 
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>
This commit is contained in:
Sergey Organov
2020-12-21 18:19:45 +03:00
committed by Junio C Hamano
parent ec315c66bb
commit 6fc944d895
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t4013-diff-various.sh
View File

@ -329,8 +329,8 @@ log --first-parent --diff-merges=off -p master
log -p --first-parent master
log -m -p --first-parent master
log -m -p master
:failure log --cc -m -p master
:failure log -c -m -p master
log --cc -m -p master
log -c -m -p master
log -SF master
log -S F master
log -SF -p master