From b1d6e88a14fb2324372c693e784b4ce6d3b3a157 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Aug 2007 08:30:16 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc4-67-gf9286 --- blame-options.txt | 20 +++++++-------- cmds-ancillaryinterrogators.txt | 2 +- cmds-ancillarymanipulators.txt | 12 ++++----- git-annotate.html | 16 ++++-------- git-blame.html | 16 ++++-------- git-clone.html | 44 +++++++++++++++++++++++++-------- git-clone.txt | 18 +++++++++++--- git-fetch.html | 21 ++++++++++------ git-pull.html | 21 ++++++++++------ git-push.html | 21 ++++++++++------ git-rev-parse.html | 2 +- git-rev-parse.txt | 2 +- git-stripspace.html | 12 +++++++-- git-stripspace.txt | 5 +++- git-tag.html | 10 +++++--- git-tag.txt | 8 +++--- git-verify-tag.html | 6 ++--- git-verify-tag.txt | 4 +-- git.html | 28 ++++++++++----------- urls.txt | 16 +++++++----- 20 files changed, 174 insertions(+), 110 deletions(-) diff --git a/blame-options.txt b/blame-options.txt index a46bf6ce7..17379f057 100644 --- a/blame-options.txt +++ b/blame-options.txt @@ -64,11 +64,11 @@ of lines before or after the line given by . assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent. - - is optional but it is the lower bound on the number of - alphanumeric characters that git must detect as moving - within a file for it to associate those lines with the parent - commit. ++ + is optional but it is the lower bound on the number of +alphanumeric characters that git must detect as moving +within a file for it to associate those lines with the parent +commit. -C||:: In addition to `-M`, detect lines copied from other @@ -77,11 +77,11 @@ of lines before or after the line given by . around across files. When this option is given twice, the command looks for copies from all other files in the parent for the commit that creates the file in addition. - - is optional but it is the lower bound on the number of - alphanumeric characters that git must detect as moving - between files for it to associate those lines with the parent - commit. ++ + is optional but it is the lower bound on the number of +alphanumeric characters that git must detect as moving +between files for it to associate those lines with the parent +commit. -h, --help:: Show help message. diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt index 5a52eabdd..c8b7db28e 100644 --- a/cmds-ancillaryinterrogators.txt +++ b/cmds-ancillaryinterrogators.txt @@ -35,7 +35,7 @@ gitlink:git-show-branch[1]:: Show branches and their commits. gitlink:git-verify-tag[1]:: - Check the GPG signature of tag. + Check the GPG signature of tags. gitlink:git-whatchanged[1]:: Show logs with difference each commit introduces. diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt index f33666575..b41bdc301 100644 --- a/cmds-ancillarymanipulators.txt +++ b/cmds-ancillarymanipulators.txt @@ -1,3 +1,6 @@ +gitlink:git-config[1]:: + Get and set repository or global options. + gitlink:git-convert-objects[1]:: Converts old-style git repository. @@ -25,12 +28,9 @@ gitlink:git-reflog[1]:: gitlink:git-relink[1]:: Hardlink common objects in local repositories. -gitlink:git-repack[1]:: - Pack unpacked objects in a repository. - -gitlink:git-config[1]:: - Get and set repository or global options. - gitlink:git-remote[1]:: manage set of tracked repositories. +gitlink:git-repack[1]:: + Pack unpacked objects in a repository. + diff --git a/git-annotate.html b/git-annotate.html index f6a5d9817..87f4beb0d 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -408,13 +408,10 @@ of lines before or after the line given by <start>.

to the child commit. With this option, both groups of lines are blamed on the parent.

-
-
-
<num> is optional but it is the lower bound on the number of
+
<num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving
 within a file for it to associate those lines with the parent
-commit.
-
+commit.

-C|<num>| @@ -428,13 +425,10 @@ commit. the command looks for copies from all other files in the parent for the commit that creates the file in addition.

-
-
-
<num> is optional but it is the lower bound on the number of
+
<num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving
 between files for it to associate those lines with the parent
-commit.
-
+commit.

-h, --help @@ -460,7 +454,7 @@ commit. diff --git a/git-blame.html b/git-blame.html index f195b818a..fbe40892f 100644 --- a/git-blame.html +++ b/git-blame.html @@ -426,13 +426,10 @@ of lines before or after the line given by <start>.

to the child commit. With this option, both groups of lines are blamed on the parent.

-
-
-
<num> is optional but it is the lower bound on the number of
+
<num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving
 within a file for it to associate those lines with the parent
-commit.
-
+commit.

-C|<num>| @@ -446,13 +443,10 @@ commit. the command looks for copies from all other files in the parent for the commit that creates the file in addition.

-
-
-
<num> is optional but it is the lower bound on the number of
+
<num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving
 between files for it to associate those lines with the parent
-commit.
-
+commit.

-h, --help @@ -692,7 +686,7 @@ commit commentary), a blame viewer won't ever care. diff --git a/git-clone.html b/git-clone.html index a35e34159..c2e1c8aea 100644 --- a/git-clone.html +++ b/git-clone.html @@ -273,7 +273,8 @@ git-clone(1) Manual Page

SYNOPSIS

-
git-clone [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare] +
git-clone [--template=<template_directory>] + [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [-o <name>] [-u <upload-pack>] [--reference <repository>] [--depth <depth>] <repository> [<directory>]
@@ -307,8 +308,24 @@ configuration variables.

this flag bypasses normal "git aware" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. - The files under .git/objects/ directory are hardlinked - to save space when possible. + The files under .git/objects/ directory are hardlinked + to save space when possible. This is now the default when + the source repository is specified with /path/to/repo + syntax, so it essentially is a no-op option. To force + copying instead of hardlinking (which may be desirable + if you are trying to make a back-up of your repository), + but still avoid the usual "git aware" transport + mechanism, --no-hardlinks can be used. +

+ +
+--no-hardlinks +
+
+

+ Optimize the cloning process from a repository on a + local filesystem by copying files under .git/objects + directory.

@@ -502,11 +519,11 @@ ssh://[user@]host.xz/~/path/to/repo.git -

SSH is the default transport protocol. You can optionally specify -which user to log-in as, and an alternate, scp-like syntax is also -supported. Both syntaxes support username expansion, -as does the native git protocol. The following three are -identical to the last three above, respectively:

+

SSH is the default transport protocol over the network. You can +optionally specify which user to log-in as, and an alternate, +scp-like syntax is also supported. Both syntaxes support +username expansion, as does the native git protocol. The following +three are identical to the last three above, respectively:

    @@ -527,7 +544,7 @@ identical to the last three above, respectively:

-

To sync with a local directory, use:

+

To sync with a local directory, you can use:

    @@ -536,8 +553,15 @@ identical to the last three above, respectively:

    /path/to/repo.git/

    +
  • +

    +file:///path/to/repo.git/ +

    +
+

They are mostly equivalent, except when cloning. See +git-clone(1) for details.

Examples

@@ -611,7 +635,7 @@ Create a repository on the kernel.org machine that borrows from Linus
diff --git a/git-clone.txt b/git-clone.txt index a0a10e3e2..227f092e2 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -9,7 +9,8 @@ git-clone - Clone a repository into a new directory SYNOPSIS -------- [verse] -'git-clone' [--template=] [-l [-s]] [-q] [-n] [--bare] +'git-clone' [--template=] + [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [-o ] [-u ] [--reference ] [--depth ] [] @@ -40,8 +41,19 @@ OPTIONS this flag bypasses normal "git aware" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. - The files under .git/objects/ directory are hardlinked - to save space when possible. + The files under `.git/objects/` directory are hardlinked + to save space when possible. This is now the default when + the source repository is specified with `/path/to/repo` + syntax, so it essentially is a no-op option. To force + copying instead of hardlinking (which may be desirable + if you are trying to make a back-up of your repository), + but still avoid the usual "git aware" transport + mechanism, `--no-hardlinks` can be used. + +--no-hardlinks:: + Optimize the cloning process from a repository on a + local filesystem by copying files under `.git/objects` + directory. --shared:: -s:: diff --git a/git-fetch.html b/git-fetch.html index df9dcc17a..e19a1c7e0 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -546,11 +546,11 @@ ssh://[user@]host.xz/~/path/to/repo.git -

SSH is the default transport protocol. You can optionally specify -which user to log-in as, and an alternate, scp-like syntax is also -supported. Both syntaxes support username expansion, -as does the native git protocol. The following three are -identical to the last three above, respectively:

+

SSH is the default transport protocol over the network. You can +optionally specify which user to log-in as, and an alternate, +scp-like syntax is also supported. Both syntaxes support +username expansion, as does the native git protocol. The following +three are identical to the last three above, respectively:

    @@ -571,7 +571,7 @@ identical to the last three above, respectively:

-

To sync with a local directory, use:

+

To sync with a local directory, you can use:

    @@ -580,8 +580,15 @@ identical to the last three above, respectively:

    /path/to/repo.git/

    +
  • +

    +file:///path/to/repo.git/ +

    +
+

They are mostly equivalent, except when cloning. See +git-clone(1) for details.

REMOTES

@@ -651,7 +658,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-pull.html b/git-pull.html index 761e91186..02c494955 100644 --- a/git-pull.html +++ b/git-pull.html @@ -592,11 +592,11 @@ ssh://[user@]host.xz/~/path/to/repo.git -

SSH is the default transport protocol. You can optionally specify -which user to log-in as, and an alternate, scp-like syntax is also -supported. Both syntaxes support username expansion, -as does the native git protocol. The following three are -identical to the last three above, respectively:

+

SSH is the default transport protocol over the network. You can +optionally specify which user to log-in as, and an alternate, +scp-like syntax is also supported. Both syntaxes support +username expansion, as does the native git protocol. The following +three are identical to the last three above, respectively:

    @@ -617,7 +617,7 @@ identical to the last three above, respectively:

-

To sync with a local directory, use:

+

To sync with a local directory, you can use:

    @@ -626,8 +626,15 @@ identical to the last three above, respectively:

    /path/to/repo.git/

    +
  • +

    +file:///path/to/repo.git/ +

    +
+

They are mostly equivalent, except when cloning. See +git-clone(1) for details.

REMOTES

@@ -896,7 +903,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-push.html b/git-push.html index ca357b6f4..8bd7edeb0 100644 --- a/git-push.html +++ b/git-push.html @@ -452,11 +452,11 @@ ssh://[user@]host.xz/~/path/to/repo.git -

SSH is the default transport protocol. You can optionally specify -which user to log-in as, and an alternate, scp-like syntax is also -supported. Both syntaxes support username expansion, -as does the native git protocol. The following three are -identical to the last three above, respectively:

+

SSH is the default transport protocol over the network. You can +optionally specify which user to log-in as, and an alternate, +scp-like syntax is also supported. Both syntaxes support +username expansion, as does the native git protocol. The following +three are identical to the last three above, respectively:

    @@ -477,7 +477,7 @@ identical to the last three above, respectively:

-

To sync with a local directory, use:

+

To sync with a local directory, you can use:

    @@ -486,8 +486,15 @@ identical to the last three above, respectively:

    /path/to/repo.git/

    +
  • +

    +file:///path/to/repo.git/ +

    +
+

They are mostly equivalent, except when cloning. See +git-clone(1) for details.

REMOTES

@@ -589,7 +596,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-rev-parse.html b/git-rev-parse.html index 35d8995eb..6f45c66d6 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -735,7 +735,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index eea9c9cfe..4b4d229e6 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -224,7 +224,7 @@ left-to-right. G H I J \ / \ / D E F - \ | / \ + \ | / \ \ | / | \|/ | B C diff --git a/git-stripspace.html b/git-stripspace.html index 7dc91d4fc..04bb82d12 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -272,7 +272,7 @@ git-stripspace(1) Manual Page

SYNOPSIS

-

git-stripspace < <stream>

+

git-stripspace [-s | --strip-comments] < <stream>

DESCRIPTION

@@ -282,6 +282,14 @@ git-stripspace(1) Manual Page
+-s\|--strip-comments +
+
+

+ In addition to empty lines, also strip lines starting with #. +

+
+
<stream>
@@ -305,7 +313,7 @@ git-stripspace(1) Manual Page
diff --git a/git-stripspace.txt b/git-stripspace.txt index 1306d7bab..521235830 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt @@ -8,7 +8,7 @@ git-stripspace - Filter out empty lines SYNOPSIS -------- -'git-stripspace' < +'git-stripspace' [-s | --strip-comments] < DESCRIPTION ----------- @@ -16,6 +16,9 @@ Remove multiple empty lines, and empty lines at beginning and end. OPTIONS ------- +-s\|--strip-comments:: + In addition to empty lines, also strip lines starting with '#'. + :: Byte stream to act on. diff --git a/git-tag.html b/git-tag.html index 5fd9eecfa..4a468dbe7 100644 --- a/git-tag.html +++ b/git-tag.html @@ -276,7 +276,7 @@ git-tag(1) Manual Page
git-tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <name> [<head>] git-tag -d <name>… git-tag [-n [<num>]] -l [<pattern>] -git-tag -v <name>
+git-tag -v <name>…

DESCRIPTION

@@ -285,7 +285,7 @@ git-tag(1) Manual Page .git/refs/tags/ directory.

If one of -a, -s, or -u <key-id> is passed, the command creates a tag object, and requires the tag message. Unless --m <msg> is given, an editor is started for the user to type +-m <msg> or -F <file> is given, an editor is started for the user to type in the tag message.

Otherwise just the SHA1 object name of the commit object is written (i.e. a lightweight tag).

@@ -346,7 +346,7 @@ GnuPG key for signing.

- Verify the gpg signature of given the tag + Verify the gpg signature of the given tag names.

@@ -357,6 +357,7 @@ GnuPG key for signing.

<num> specifies how many lines from the annotation, if any, are printed when using -l. The default is not to print any annotation lines. + If no number is given to -n, only the first line is printed.

@@ -365,6 +366,7 @@ GnuPG key for signing.

List tags with names that match the given pattern (or all if no pattern is given). + Typing "git tag" without arguments, also lists all tags.

@@ -531,7 +533,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.< diff --git a/git-tag.txt b/git-tag.txt index aee2c1bdc..119117f0b 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git-tag' [-a | -s | -u ] [-f] [-m | -F ] [] 'git-tag' -d ... 'git-tag' [-n []] -l [] -'git-tag' -v +'git-tag' -v ... DESCRIPTION ----------- @@ -23,7 +23,7 @@ Unless `-f` is given, the tag must not yet exist in If one of `-a`, `-s`, or `-u ` is passed, the command creates a 'tag' object, and requires the tag message. Unless -`-m ` is given, an editor is started for the user to type +`-m ` or `-F ` is given, an editor is started for the user to type in the tag message. Otherwise just the SHA1 object name of the commit object is @@ -59,15 +59,17 @@ OPTIONS Delete existing tags with the given names. -v:: - Verify the gpg signature of given the tag + Verify the gpg signature of the given tag names. -n :: specifies how many lines from the annotation, if any, are printed when using -l. The default is not to print any annotation lines. + If no number is given to `-n`, only the first line is printed. -l :: List tags with names that match the given pattern (or all if no pattern is given). + Typing "git tag" without arguments, also lists all tags. -m :: Use the given tag message (instead of prompting) diff --git a/git-verify-tag.html b/git-verify-tag.html index 7215010c3..7a1b9ca5b 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -266,13 +266,13 @@ git-verify-tag(1) Manual Page

NAME

git-verify-tag - - Check the GPG signature of tag + Check the GPG signature of tags

SYNOPSIS

-

git-verify-tag <tag>

+

git-verify-tag <tag>…

DESCRIPTION

@@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page
diff --git a/git-verify-tag.txt b/git-verify-tag.txt index 48d17fd9c..ac7fb1915 100644 --- a/git-verify-tag.txt +++ b/git-verify-tag.txt @@ -3,11 +3,11 @@ git-verify-tag(1) NAME ---- -git-verify-tag - Check the GPG signature of tag +git-verify-tag - Check the GPG signature of tags SYNOPSIS -------- -'git-verify-tag' +'git-verify-tag' ... DESCRIPTION ----------- diff --git a/git.html b/git.html index 4c771805b..169487ab4 100644 --- a/git.html +++ b/git.html @@ -681,6 +681,14 @@ ancillary user utilities.

Manipulators:

+git-config(1) +
+
+

+ Get and set repository or global options. +

+
+
git-convert-objects(1)
@@ -753,27 +761,19 @@ ancillary user utilities.

-git-repack(1) -
-
-

- Pack unpacked objects in a repository. -

-
-
-git-config(1) +git-remote(1)

- Get and set repository or global options. + manage set of tracked repositories.

-git-remote(1) +git-repack(1)

- manage set of tracked repositories. + Pack unpacked objects in a repository.

@@ -880,7 +880,7 @@ ancillary user utilities.

- Check the GPG signature of tag. + Check the GPG signature of tags.

@@ -2429,7 +2429,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/urls.txt b/urls.txt index 781df4174..b38145faf 100644 --- a/urls.txt +++ b/urls.txt @@ -15,11 +15,11 @@ to name the remote repository: - ssh://{startsb}user@{endsb}host.xz/~/path/to/repo.git =============================================================== -SSH is the default transport protocol. You can optionally specify -which user to log-in as, and an alternate, scp-like syntax is also -supported. Both syntaxes support username expansion, -as does the native git protocol. The following three are -identical to the last three above, respectively: +SSH is the default transport protocol over the network. You can +optionally specify which user to log-in as, and an alternate, +scp-like syntax is also supported. Both syntaxes support +username expansion, as does the native git protocol. The following +three are identical to the last three above, respectively: =============================================================== - {startsb}user@{endsb}host.xz:/path/to/repo.git/ @@ -27,8 +27,12 @@ identical to the last three above, respectively: - {startsb}user@{endsb}host.xz:path/to/repo.git =============================================================== -To sync with a local directory, use: +To sync with a local directory, you can use: =============================================================== - /path/to/repo.git/ +- file:///path/to/repo.git/ =============================================================== + +They are mostly equivalent, except when cloning. See +gitlink:git-clone[1] for details. -- 2.26.2