From 2d47c62a3df350dff294aba379e2a5430fd130d1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 18 Jan 2007 06:24:10 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc1-gdf1b --- git-cherry-pick.html | 4 +++- git-cherry-pick.txt | 2 ++ git-diff.html | 4 +++- git-diff.txt | 3 +++ git-format-patch.html | 6 ++++-- git-format-patch.txt | 4 +++- git-log.html | 5 ++++- git-log.txt | 3 +++ git-rev-parse.html | 13 ++++++++++++- git-rev-parse.txt | 8 ++++++++ git-revert.html | 4 +++- git-revert.txt | 2 ++ git-show.html | 4 +++- git-show.txt | 2 ++ gitk.html | 4 +++- gitk.txt | 2 ++ 16 files changed, 60 insertions(+), 10 deletions(-) diff --git a/git-cherry-pick.html b/git-cherry-pick.html index f7f0449fb..7fc474e08 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -289,6 +289,8 @@ modifications from the HEAD commit).

Commit to cherry-pick. + For a more complete list of ways to spell commits, see + "SPECIFYING REVISIONS" section in git-rev-parse(1).

@@ -360,7 +362,7 @@ effect to your working tree in a row.

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 875edb6b9..3149d08da 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -19,6 +19,8 @@ OPTIONS ------- :: Commit to cherry-pick. + For a more complete list of ways to spell commits, see + "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. -e|--edit:: With this option, `git-cherry-pick` will let you edit the commit diff --git a/git-diff.html b/git-diff.html index 8fb0e4676..899b6e271 100644 --- a/git-diff.html +++ b/git-diff.html @@ -327,6 +327,8 @@ tree and the index file, or the index file and the working tree.

Just in case if you are doing something exotic, it should be noted that all of the <commit> in the above description can be any <tree-ish>.

+

For a more complete list of ways to spell <commit>, see +"SPECIFYING REVISIONS" section in git-rev-parse(1).

OPTIONS

@@ -817,7 +819,7 @@ output diff in reverse.
diff --git a/git-diff.txt b/git-diff.txt index 8977877b2..6a098df26 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -47,6 +47,9 @@ Just in case if you are doing something exotic, it should be noted that all of the in the above description can be any . +For a more complete list of ways to spell , see +"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. + OPTIONS ------- diff --git a/git-format-patch.html b/git-format-patch.html index a5104ce5a..133b40e3c 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -283,7 +283,9 @@ git-format-patch(1) Manual Page

Prepare each commit between <since> and <until> with its patch in one file per commit, formatted to resemble UNIX mailbox format. If ..<until> is not specified, the head of the current working -tree is implied.

+tree is implied. For a more complete list of ways to spell +<since> and <until>, see "SPECIFYING REVISIONS" section in +git-rev-parse(1).

The output of this command is convenient for e-mail submission or for use with git-am(1).

Each output file is numbered sequentially from 1, and uses the @@ -469,7 +471,7 @@ git-format-patch -M -B origin

diff --git a/git-format-patch.txt b/git-format-patch.txt index 23acb4752..574cf76dc 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -20,7 +20,9 @@ DESCRIPTION Prepare each commit between and with its patch in one file per commit, formatted to resemble UNIX mailbox format. If .. is not specified, the head of the current working -tree is implied. +tree is implied. For a more complete list of ways to spell + and , see "SPECIFYING REVISIONS" section in +gitlink:git-rev-parse[1]. The output of this command is convenient for e-mail submission or for use with gitlink:git-am[1]. diff --git a/git-log.html b/git-log.html index 6ee7c7a77..5804b56cf 100644 --- a/git-log.html +++ b/git-log.html @@ -444,6 +444,9 @@ simplification into account.

Show only commits between the named two commits. When either <since> or <until> is omitted, it defaults to HEAD, i.e. the tip of the current branch. + For a more complete list of ways to spell <since> + and <until>, see "SPECIFYING REVISIONS" section in + git-rev-parse(1).

@@ -595,7 +598,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 60610f91f..b8029463d 100644 --- a/git-log.txt +++ b/git-log.txt @@ -34,6 +34,9 @@ include::pretty-formats.txt[] Show only commits between the named two commits. When either or is omitted, it defaults to `HEAD`, i.e. the tip of the current branch. + For a more complete list of ways to spell + and , see "SPECIFYING REVISIONS" section in + gitlink:git-rev-parse[1]. -p:: Show the change the commit introduces in a patch form. diff --git a/git-rev-parse.html b/git-rev-parse.html index d452f1ee4..0397fce30 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -548,6 +548,17 @@ A ref followed by the suffix @ with a date specification

  • +A ref followed by the suffix @ with an ordinal specification + enclosed in a brace pair (e.g. {1}, {15}) to specify + the n-th prior value of that ref. For example master@{1} + is the immediate prior value of master while master@{5} + is the 5th prior value of master. This suffix may only be used + immediately following a ref name and the ref must have an existing + log ($GIT_DIR/logs/<ref>). +

    +
    • +
  • +

    A suffix ^ to a revision parameter means the first parent of that commit object. ^<n> means the <n>th parent (i.e. rev^ @@ -681,7 +692,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 4eaf5a0d1..aeb37b65d 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -152,6 +152,14 @@ blobs contained in a commit. used immediately following a ref name and the ref must have an existing log ($GIT_DIR/logs/). +* A ref followed by the suffix '@' with an ordinal specification + enclosed in a brace pair (e.g. '\{1\}', '\{15\}') to specify + the n-th prior value of that ref. For example 'master@\{1\}' + is the immediate prior value of 'master' while 'master@\{5\}' + is the 5th prior value of 'master'. This suffix may only be used + immediately following a ref name and the ref must have an existing + log ($GIT_DIR/logs/). + * A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}' means the th parent (i.e. 'rev{caret}' diff --git a/git-revert.html b/git-revert.html index 3238f5498..f9d38dd0d 100644 --- a/git-revert.html +++ b/git-revert.html @@ -289,6 +289,8 @@ modifications from the HEAD commit).

    Commit to revert. + For a more complete list of ways to spell commit names, see + "SPECIFYING REVISIONS" section in git-rev-parse(1).

    @@ -343,7 +345,7 @@ effect to your working tree in a row.

    diff --git a/git-revert.txt b/git-revert.txt index 71f7815d6..8081bbaff 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -19,6 +19,8 @@ OPTIONS ------- :: Commit to revert. + For a more complete list of ways to spell commit names, see + "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. -e|--edit:: With this option, `git-revert` will let you edit the commit diff --git a/git-show.html b/git-show.html index 530bf5529..257e4b783 100644 --- a/git-show.html +++ b/git-show.html @@ -295,6 +295,8 @@ with --name-only).

    The name of the object to show. + For a more complete list of ways to spell object names, see + "SPECIFYING REVISIONS" section in git-rev-parse(1).

    @@ -562,7 +564,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/git-show.txt b/git-show.txt index c210b9af6..9051951c3 100644 --- a/git-show.txt +++ b/git-show.txt @@ -32,6 +32,8 @@ OPTIONS ------- :: The name of the object to show. + For a more complete list of ways to spell object names, see + "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. include::pretty-formats.txt[] diff --git a/gitk.html b/gitk.html index e835d27bb..afa99c48f 100644 --- a/gitk.html +++ b/gitk.html @@ -330,6 +330,8 @@ frequently used options.

    meaning show from the given revision and back, or it can be a range in the form "<from>..<to>" to show all revisions between <from> and back to <to>. Note, more advanced revision selection can be applied. + For a more complete list of ways to spell object names, see + "SPECIFYING REVISIONS" section in git-rev-parse(1).

    @@ -423,7 +425,7 @@ gitk --max-count=100 --all — Makefile diff --git a/gitk.txt b/gitk.txt index f1aeb07f6..6e2a8782c 100644 --- a/gitk.txt +++ b/gitk.txt @@ -47,6 +47,8 @@ frequently used options. meaning show from the given revision and back, or it can be a range in the form "''..''" to show all revisions between '' and back to ''. Note, more advanced revision selection can be applied. + For a more complete list of ways to spell object names, see + "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. :: -- 2.26.2