diff options
| author | Philip Oakley <philipoakley@iee.org> | 2016-08-13 00:45:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-13 19:36:44 -0700 |
| commit | 7a5370e612ca6d5e2f5a3b6835ec7439fb04bd6c (patch) | |
| tree | fe102b0dedb1cff9cf94a6c03b154daabe4c29c0 /Documentation/revisions.txt | |
| parent | 1afe13b98a9865c012daffca5d0ac56aced318fb (diff) | |
| download | git-7a5370e612ca6d5e2f5a3b6835ec7439fb04bd6c.tar.gz | |
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/revisions.txt')
| -rw-r--r-- | Documentation/revisions.txt | 23 |
1 files 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 '<rev>' 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 |