From a387df351c783f68378511c35d12d637498c7211 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 29 Aug 2008 08:56:58 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0.1-141-g445ca --- git-diff-tree.html | 4 ++-- git-log.html | 4 ++-- git-rev-list.html | 4 ++-- git-show.html | 4 ++-- git-whatchanged.html | 4 ++-- gitk.html | 14 +++++++++++++- gitk.txt | 7 +++++++ gittutorial.html | 28 +++++++++++++++++++++++++--- gittutorial.txt | 29 ++++++++++++++++++++++++++++- pretty-formats.txt | 2 +- 10 files changed, 84 insertions(+), 16 deletions(-) diff --git a/git-diff-tree.html b/git-diff-tree.html index 584177708..c33b89c5d 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1184,7 +1184,7 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • -%ad: author date +%ad: author date (format respects --date= option)

  • @@ -1862,7 +1862,7 @@ the pathname, but if that is NUL, the record will show two paths.

    diff --git a/git-log.html b/git-log.html index 6d7ecdf32..cfd046a23 100644 --- a/git-log.html +++ b/git-log.html @@ -1698,7 +1698,7 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • -%ad: author date +%ad: author date (format respects --date= option)

  • @@ -2166,7 +2166,7 @@ reversible operation.

    diff --git a/git-rev-list.html b/git-rev-list.html index 3955a0b18..e9af4092f 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1285,7 +1285,7 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • -%ad: author date +%ad: author date (format respects --date= option)

  • @@ -1441,7 +1441,7 @@ and the git-list <git@vger.kernel.org>.

    diff --git a/git-show.html b/git-show.html index 735cbe214..9ffdb1100 100644 --- a/git-show.html +++ b/git-show.html @@ -577,7 +577,7 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • -%ad: author date +%ad: author date (format respects --date= option)

  • @@ -850,7 +850,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/git-whatchanged.html b/git-whatchanged.html index 3f845e720..30270517f 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -609,7 +609,7 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • -%ad: author date +%ad: author date (format respects --date= option)

  • @@ -789,7 +789,7 @@ Junio C Hamano <gitster@pobox.com>

    diff --git a/gitk.html b/gitk.html index e172903ea..75ad617f3 100644 --- a/gitk.html +++ b/gitk.html @@ -384,6 +384,18 @@ frequently used options.

    +--argscmd=<command> +
    +
    +

    + Command to be run each time gitk has to determine the list of + <revs> to show. The command is expected to print on its standard + output a list of additional revs to be shown, one per line. + Use this instead of explicitly specifying <revs> if the set of + commits to show may vary between refreshes. +

    +
    +
    <revs>
    @@ -492,7 +504,7 @@ such as display options, font, and colors.

    diff --git a/gitk.txt b/gitk.txt index 6e827cd11..ae29a00d5 100644 --- a/gitk.txt +++ b/gitk.txt @@ -49,6 +49,13 @@ frequently used options. the history between two branches (i.e. the HEAD and the MERGE_HEAD) that modify the conflicted files. +--argscmd=:: + Command to be run each time gitk has to determine the list of + to show. The command is expected to print on its standard + output a list of additional revs to be shown, one per line. + Use this instead of explicitly specifying if the set of + commits to show may vary between refreshes. + :: Limit the revisions to show. This can be either a single revision diff --git a/gittutorial.html b/gittutorial.html index 8651c5bc6..6e616900d 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -586,9 +586,31 @@ pulling, like this:

    alice$ git fetch /home/bob/myrepo master
-alice$ git log -p ..FETCH_HEAD
    +alice$ git log -p HEAD..FETCH_HEAD
    -

    This operation is safe even if Alice has uncommitted local changes.

    +

    This operation is safe even if Alice has uncommitted local changes. +The range notation HEAD..FETCH_HEAD" means "show everything that is reachable +from the FETCH_HEAD but exclude anything that is reachable from HEAD. +Alice already knows everything that leads to her current state (HEAD), +and reviewing what Bob has in his state (FETCH_HEAD) that she has not +seen with this command

    +

    If Alice wants to visualize what Bob did since their histories forked +she can issue the following command:

    +
    +
    +
    $ gitk HEAD..FETCH_HEAD
    +
    +

    This uses the same two-dot range notation we saw earlier with git log.

    +

    Alice may want to view what both of them did since they forked. +She can use three-dot form instead of the two-dot form:

    +
    +
    +
    $ gitk HEAD...FETCH_HEAD
    +
    +

    This means "show everything that is reachable from either one, but +exclude anything that is reachable from both of them".

    +

    Please note that these range notation can be used with both gitk +and "git log".

    After inspecting what Bob did, if there is nothing urgent, Alice may decide to continue working without pulling from Bob. If Bob's history does have something Alice would immediately need, Alice may choose to @@ -881,7 +903,7 @@ digressions that may be interesting at this point are:

    diff --git a/gittutorial.txt b/gittutorial.txt index 48d1454a9..384972cb9 100644 --- a/gittutorial.txt +++ b/gittutorial.txt @@ -321,10 +321,37 @@ pulling, like this: ------------------------------------------------ alice$ git fetch /home/bob/myrepo master -alice$ git log -p ..FETCH_HEAD +alice$ git log -p HEAD..FETCH_HEAD ------------------------------------------------ This operation is safe even if Alice has uncommitted local changes. +The range notation HEAD..FETCH_HEAD" means "show everything that is reachable +from the FETCH_HEAD but exclude anything that is reachable from HEAD. +Alice already knows everything that leads to her current state (HEAD), +and reviewing what Bob has in his state (FETCH_HEAD) that she has not +seen with this command + +If Alice wants to visualize what Bob did since their histories forked +she can issue the following command: + +------------------------------------------------ +$ gitk HEAD..FETCH_HEAD +------------------------------------------------ + +This uses the same two-dot range notation we saw earlier with 'git log'. + +Alice may want to view what both of them did since they forked. +She can use three-dot form instead of the two-dot form: + +------------------------------------------------ +$ gitk HEAD...FETCH_HEAD +------------------------------------------------ + +This means "show everything that is reachable from either one, but +exclude anything that is reachable from both of them". + +Please note that these range notation can be used with both gitk +and "git log". After inspecting what Bob did, if there is nothing urgent, Alice may decide to continue working without pulling from Bob. If Bob's history diff --git a/pretty-formats.txt b/pretty-formats.txt index c11d49577..388d4925e 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt @@ -103,7 +103,7 @@ The placeholders are: - '%an': author name - '%aN': author name (respecting .mailmap) - '%ae': author email -- '%ad': author date +- '%ad': author date (format respects --date= option) - '%aD': author date, RFC2822 style - '%ar': author date, relative - '%at': author date, UNIX timestamp -- 2.26.2