summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Philip Oakley <philipoakley@iee.org>2016-08-13 00:45:21 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-13 19:36:44 -0700
commit7a5370e612ca6d5e2f5a3b6835ec7439fb04bd6c (patch)
treefe102b0dedb1cff9cf94a6c03b154daabe4c29c0 /Documentation/merge-strategies.txt
parentdoc: revisions - clarify reachability examples (diff)
downloadtgif-7a5370e612ca6d5e2f5a3b6835ec7439fb04bd6c.tar.xz
doc: revisions: show revision expansion in examples
The revisions examples show the revison arguments and the selected commits, but do not show the intermediate step of the expansion of the special 'range' notations. Extend the examples, including an all-parents multi-parent merge commit example. Sort the examples and fix the alignment for those unaffected in the next commit. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions