From 7a5370e612ca6d5e2f5a3b6835ec7439fb04bd6c Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Sat, 13 Aug 2016 00:45:21 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/revisions.txt | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index e8120c0a0a..728bd0959f 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -325,16 +325,27 @@ Revision Range Summary as giving commit '' and then all its parents prefixed with '{caret}' to exclude them (and their ancestors). -Here are a handful of examples: +Here are a handful of examples using the Loeliger illustration above, +with each step in the notation's expansion and selection carefully +spelt out: + Args Expanded arguments Selected commits D G H D D F G H I J D F ^G D H D ^D B E I J F B - B..C C - B...C G H D E B C + B..C = ^B C C + B...C = B ^F C G H D E B C ^D B C E I J F B C C I J F C - C^@ I J F - C^! C - F^! D G H D F + C^@ = C^1 + = F I J F + B^@ = B^1 B^2 B^3 + = D E F D G H E F I J + C^! = C ^C^@ + = C ^C^1 + = C ^F C + B^! = B ^B^@ + = B ^B^1 ^B^2 ^B^3 + = B ^D ^E ^F B + F^! D = F ^I ^J D G H D F -- 2.32.0.93.g670b81a890