diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:20:00 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | af04d8f1a5a38373fba762071824bc85da7cc050 (patch) | |
| tree | 23393f02b962c0ccc3524b029a8c7e02ce7f5bd1 /t/t6404-recursive-merge.sh | |
| parent | doc/git-show: include --diff-merges description (diff) | |
| download | tgif-af04d8f1a5a38373fba762071824bc85da7cc050.tar.xz | |
t4013: add tests for --diff-merges=first-parent
This new option provides essential new functionality, changing diff
output to first parent only, without changing history traversal mode,
so it deserves its own test.
As we do it, add additional test that --diff-merges=first-parent by
itself doesn't imply -p and only outputs diffs for merge commits.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6404-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions