summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2020-12-21 18:19:58 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-21 13:47:32 -0800
commite58142add40e0db354eaed9554d1b0c871e23f7d (patch)
tree4234b1489981b60b7022db5584efc95dcd8c8f3b /Documentation/diff-options.txt
parentdoc/diff-generate-patch: mention new --diff-merges option (diff)
downloadtgif-e58142add40e0db354eaed9554d1b0c871e23f7d.tar.xz
doc/rev-list-options: document --first-parent changes merges format
After introduction of the --diff-merges=first-parent, the --first-parent sets the default format for merges to the same value as this new option. Document this behavior and add corresponding reference to --diff-merges. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions