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>
Philip Oakley committed
Aug 13, 2016 at 00:45 UTC
7a5370e612ca6d5e2f5a3b6835ec7439fb04bd6c
1 file changed
+17
-6
Documentation/revisions.txt
+17
-6
@@ -325,16 +325,27 @@ Revision Range Summary
325
as giving commit '<rev>' and then all its parents prefixed with
326
'{caret}' to exclude them (and their ancestors).
327
328
-Here are a handful of examples:
328
+Here are a handful of examples using the Loeliger illustration above,
329
+with each step in the notation's expansion and selection carefully
330
+spelt out:
331
332
+ Args Expanded arguments Selected commits
333
D G H D
334
D F G H I J D F
335
^G D H D
336
^D B E I J F B
334
- B..C C
335
- B...C G H D E B C
337
+ B..C = ^B C C
338
+ B...C = B ^F C G H D E B C
339
^D B C E I J F B C
340
C I J F C
338
- C^@ I J F
339
- C^! C
340
- F^! D G H D F
341
+ C^@ = C^1
342
+ = F I J F
343
+ B^@ = B^1 B^2 B^3
344
+ = D E F D G H E F I J
345
+ C^! = C ^C^@
346
+ = C ^C^1
347
+ = C ^F C
348
+ B^! = B ^B^@
349
+ = B ^B^1 ^B^2 ^B^3
350
+ = B ^D ^E ^F B
351
+ F^! D = F ^I ^J D G H D F