From 24bc09a2408f779de87b173b93386f5d1cbeee34 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 28 Feb 2008 00:27:44 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.3-325-g6d21 --- config.txt | 23 ++++++++++++++++++++--- diff-options.txt | 8 ++++++++ git-branch.html | 34 ++++++++++++++++------------------ git-branch.txt | 32 +++++++++++++++----------------- git-checkout.html | 26 ++++++++++++-------------- git-checkout.txt | 24 +++++++++++------------- git-clone.html | 20 +++++++++++++++++++- git-config.html | 30 ++++++++++++++++++++++++++---- git-describe.html | 12 +++++++++++- git-describe.txt | 5 +++++ git-diff-files.html | 15 ++++++++++++++- git-diff-index.html | 15 ++++++++++++++- git-diff-tree.html | 15 ++++++++++++++- git-diff.html | 15 ++++++++++++++- git-fetch.html | 20 +++++++++++++++++++- git-format-patch.html | 36 +++++++++++++++++++++++++++++++++++- git-format-patch.txt | 25 ++++++++++++++++++------- git-log.html | 24 +++++++++++++++++++++++- git-pack-objects.html | 4 +++- git-pack-objects.txt | 2 ++ git-pull.html | 20 +++++++++++++++++++- git-push.html | 20 +++++++++++++++++++- git-rev-list.html | 12 +++++++++++- git-rev-list.txt | 1 + git-svn.html | 12 +++++++++++- git-svn.txt | 4 ++++ rev-list-options.txt | 5 +++++ urls.txt | 23 +++++++++++++++++++++++ 28 files changed, 392 insertions(+), 90 deletions(-) diff --git a/config.txt b/config.txt index fb6dae0cc..4027726f2 100644 --- a/config.txt +++ b/config.txt @@ -379,10 +379,14 @@ apply.whitespace:: branch.autosetupmerge:: Tells `git-branch` and `git-checkout` to setup new branches - so that linkgit:git-pull[1] will appropriately merge from that - remote branch. Note that even if this option is not set, + so that linkgit:git-pull[1] will appropriately merge from the + starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` - and `--no-track` options. This option defaults to true. + and `--no-track` options. The valid settings are: `false` -- no + automatic setup is done; `true` -- automatic setup is done when the + starting point is a remote branch; `always` -- automatic setup is + done when the starting point is either a local branch or remote + branch. This option defaults to true. branch..remote:: When in branch , it tells `git fetch` which remote to fetch. @@ -812,6 +816,8 @@ pack.threads:: warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly. pack.indexVersion:: Specify the default pack index version. Valid values are 1 for @@ -897,6 +903,17 @@ tar.umask:: archiving user's umask will be used instead. See umask(2) and linkgit:git-archive[1]. +url..insteadOf:: + Any URL that starts with this value will be rewritten to + start, instead, with . In cases where some site serves a + large number of repositories, and serves them with multiple + access methods, and some users need to use different access + methods, this feature allows people to specify any of the + equivalent URLs and have git automatically rewrite the URL to + the best alternative for the particular user, even for a + never-before-seen repository on the site. When more than one + insteadOf strings match a given URL, the longest match is used. + user.email:: Your email address to be recorded in any newly created commits. Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and diff --git a/diff-options.txt b/diff-options.txt index 8d35cbd60..8dc5b001c 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -170,6 +170,14 @@ endif::git-format-patch[] Swap two inputs; that is, show differences from index or on-disk file to tree contents. +--relative[=]:: + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a as an argument. + --text:: Treat all files as text. diff --git a/git-branch.html b/git-branch.html index 227436d9c..6e1bc8bd0 100644 --- a/git-branch.html +++ b/git-branch.html @@ -297,11 +297,10 @@ equal to that of the currently checked out branch.

working tree to it; use "git checkout <newbranch>" to switch to the new branch.

When a local branch is started off a remote branch, git sets up the -branch so that git-pull(1) will appropriately merge from that -remote branch. If this behavior is not desired, it is possible to -disable it using the global branch.autosetupmerge configuration -flag. That setting can be overridden by using the --track -and --no-track options.

+branch so that git-pull(1) will appropriately merge from +the remote branch. This behavior may be changed via the global +branch.autosetupmerge configuration flag. That setting can be +overridden by using the --track and --no-track options.

With a -m or -M option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch @@ -433,14 +432,16 @@ clean up all obsolete remote-tracking branches.

- Set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - --no-track were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + <repository> <refspec>" explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to false if you want + git-checkout and git-branch to always behave as if --no-track were + given. Set it to always if you want this behavior when the + start-point is either a local or remote branch.

@@ -448,10 +449,7 @@ clean up all obsolete remote-tracking branches.

- When a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable.

@@ -566,7 +564,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index 7e8874aca..6f07a17a2 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -35,11 +35,10 @@ working tree to it; use "git checkout " to switch to the new branch. When a local branch is started off a remote branch, git sets up the -branch so that linkgit:git-pull[1] will appropriately merge from that -remote branch. If this behavior is not desired, it is possible to -disable it using the global `branch.autosetupmerge` configuration -flag. That setting can be overridden by using the `--track` -and `--no-track` options. +branch so that linkgit:git-pull[1] will appropriately merge from +the remote branch. This behavior may be changed via the global +`branch.autosetupmerge` configuration flag. That setting can be +overridden by using the `--track` and `--no-track` options. With a '-m' or '-M' option, will be renamed to . If had a corresponding reflog, it is renamed to match @@ -105,20 +104,19 @@ OPTIONS Display the full sha1s in output listing rather than abbreviating them. --track:: - Set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull " explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - '--no-track' were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + " explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to `false` if you want + git-checkout and git-branch to always behave as if '--no-track' were + given. Set it to `always` if you want this behavior when the + start-point is either a local or remote branch. --no-track:: - When a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. :: The name of the branch to create or delete. diff --git a/git-checkout.html b/git-checkout.html index 83420b046..e5a74dd67 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -330,15 +330,16 @@ working tree.

- When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - --no-track were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + <repository> <refspec>" explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to false if you want + git-checkout and git-branch to always behave as if --no-track were + given. Set it to always if you want this behavior when the + start-point is either a local or remote branch.

@@ -346,10 +347,7 @@ working tree.

- When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable.

@@ -541,7 +539,7 @@ $ git add frotz diff --git a/git-checkout.txt b/git-checkout.txt index b4cfa044b..4014e7256 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -48,21 +48,19 @@ OPTIONS may restrict the characters allowed in a branch name. --track:: - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull " explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - '--no-track' were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + " explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to `false` if you want + git-checkout and git-branch to always behave as if '--no-track' were + given. Set it to `always` if you want this behavior when the + start-point is either a local or remote branch. --no-track:: - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. -l:: Create the new branch's reflog. This activates recording of diff --git a/git-clone.html b/git-clone.html index 737769d39..958f9776c 100644 --- a/git-clone.html +++ b/git-clone.html @@ -573,6 +573,24 @@ file:///path/to/repo.git/

They are equivalent, except the former implies --local option.

+

If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:

+
+
+
        [url "<actual url base>"]
+                insteadOf = <other url base>
+
+

For example, with this:

+
+
+
        [url "git://git.host.xz/"]
+                insteadOf = host.xz:/path/to/
+                insteadOf = work:
+
+

a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".

Examples

@@ -646,7 +664,7 @@ Create a repository on the kernel.org machine that borrows from Linus
diff --git a/git-config.html b/git-config.html index d380da135..c826e1a0b 100644 --- a/git-config.html +++ b/git-config.html @@ -1204,10 +1204,14 @@ branch.autosetupmerge

Tells git-branch and git-checkout to setup new branches - so that git-pull(1) will appropriately merge from that - remote branch. Note that even if this option is not set, + so that git-pull(1) will appropriately merge from the + starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the --track - and --no-track options. This option defaults to true. + and --no-track options. The valid settings are: false — no + automatic setup is done; true — automatic setup is done when the + starting point is a remote branch; always — automatic setup is + done when the starting point is either a local branch or remote + branch. This option defaults to true.

@@ -2002,6 +2006,8 @@ pack.threads warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly.

@@ -2175,6 +2181,22 @@ tar.umask

+url.<base>.insteadOf +
+
+

+ Any URL that starts with this value will be rewritten to + start, instead, with <base>. In cases where some site serves a + large number of repositories, and serves them with multiple + access methods, and some users need to use different access + methods, this feature allows people to specify any of the + equivalent URLs and have git automatically rewrite the URL to + the best alternative for the particular user, even for a + never-before-seen repository on the site. When more than one + insteadOf strings match a given URL, the longest match is used. +

+
+
user.email
@@ -2286,7 +2308,7 @@ web.browser diff --git a/git-describe.html b/git-describe.html index 7c33eeaca..6e851d7d6 100644 --- a/git-describe.html +++ b/git-describe.html @@ -338,6 +338,16 @@ additional commits and the abbreviated object name of the commit.

candidates to describe the input committish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result. + An <n> of 0 will cause only exact matches to be output. +

+
+
+--exact-match +
+
+

+ Only output exact matches (a tag directly references the + supplied commit). This is a synonym for --candidates=0.

@@ -437,7 +447,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-describe.txt b/git-describe.txt index 1c3dfb40c..fbb40a291 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -45,6 +45,11 @@ OPTIONS candidates to describe the input committish consider up to candidates. Increasing above 10 will take slightly longer but may produce a more accurate result. + An of 0 will cause only exact matches to be output. + +--exact-match:: + Only output exact matches (a tag directly references the + supplied commit). This is a synonym for --candidates=0. --debug:: Verbosely display information about the searching strategy diff --git a/git-diff-files.html b/git-diff-files.html index 585729d69..2e44b6918 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -601,6 +601,19 @@ same as "git-diff-index" and "git-diff-tree".

+--relative[=<path>] +
+
+

+ When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +

+
+
--text
@@ -1261,7 +1274,7 @@ the pathname, but if that is NUL, the record will show two paths.

diff --git a/git-diff-index.html b/git-diff-index.html index c3338948c..37b68cbc4 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -602,6 +602,19 @@ entries in the index are compared.

+--relative[=<path>] +
+
+

+ When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +

+
+
--text
@@ -1343,7 +1356,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 09afd553a..053b7dbf1 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -604,6 +604,19 @@ git-diff-tree(1) Manual Page

+--relative[=<path>] +
+
+

+ When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +

+
+
--text
@@ -1731,7 +1744,7 @@ the pathname, but if that is NUL, the record will show two paths.

diff --git a/git-diff.html b/git-diff.html index 9f1a12849..8983b8540 100644 --- a/git-diff.html +++ b/git-diff.html @@ -680,6 +680,19 @@ and the range notations ("<commit>..<commit>" and

+--relative[=<path>] +
+
+

+ When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +

+
+
--text
@@ -1458,7 +1471,7 @@ Output diff in reverse. diff --git a/git-fetch.html b/git-fetch.html index 5b7174aaa..a9c34389e 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -594,6 +594,24 @@ file:///path/to/repo.git/

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

+

If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:

+
+
+
        [url "<actual url base>"]
+                insteadOf = <other url base>
+
+

For example, with this:

+
+
+
        [url "git://git.host.xz/"]
+                insteadOf = host.xz:/path/to/
+                insteadOf = work:
+
+

a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".

REMOTES

@@ -663,7 +681,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-format-patch.html b/git-format-patch.html index cf1875e27..e149dd00e 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -281,6 +281,8 @@ git-format-patch(1) Manual Page [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--subject-prefix=Subject-Prefix] + [--cc=<email>] + [--cover-letter] [ <since> | <revision range> ]

DESCRIPTION

@@ -648,6 +650,19 @@ reference.

+--relative[=<path>] +
+
+

+ When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +

+
+
--text
@@ -913,6 +928,25 @@ reference.

+--cc=<email> +
+
+

+ Add a "Cc:" header to the email headers. This is in addition + to any configured headers, and may be used multiple times. +

+
+
+--cover-letter +
+
+

+ Generate a cover letter template. You still have to fill in + a description, but the shortlog and the diffstat will be + generated for you. +

+
+
--suffix=.<sfx>
@@ -1017,7 +1051,7 @@ git-format-patch -3 diff --git a/git-format-patch.txt b/git-format-patch.txt index 651efe6ca..b5207b760 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -10,13 +10,15 @@ SYNOPSIS -------- [verse] 'git-format-patch' [-k] [-o | --stdout] [--thread] - [--attach[=] | --inline[=]] - [-s | --signoff] [] - [-n | --numbered | -N | --no-numbered] - [--start-number ] [--numbered-files] - [--in-reply-to=Message-Id] [--suffix=.] - [--ignore-if-in-upstream] - [--subject-prefix=Subject-Prefix] + [--attach[=] | --inline[=]] + [-s | --signoff] [] + [-n | --numbered | -N | --no-numbered] + [--start-number ] [--numbered-files] + [--in-reply-to=Message-Id] [--suffix=.] + [--ignore-if-in-upstream] + [--subject-prefix=Subject-Prefix] + [--cc=] + [--cover-letter] [ | ] DESCRIPTION @@ -135,6 +137,15 @@ include::diff-options.txt[] allows for useful naming of a patch series, and can be combined with the --numbered option. +--cc=:: + Add a "Cc:" header to the email headers. This is in addition + to any configured headers, and may be used multiple times. + +--cover-letter:: + Generate a cover letter template. You still have to fill in + a description, but the shortlog and the diffstat will be + generated for you. + --suffix=.:: Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is diff --git a/git-log.html b/git-log.html index ab8cdb1ef..0c3eba74d 100644 --- a/git-log.html +++ b/git-log.html @@ -602,6 +602,19 @@ each commit introduces are shown.

+--relative[=<path>] +
+
+

+ When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +

+
+
--text
@@ -1043,6 +1056,15 @@ limiting may be applied.

+-F, --fixed-strings +
+
+

+ Consider the limiting patterns to be fixed strings (don't interpret + pattern as a regular expression). +

+
+
--remove-empty
@@ -1894,7 +1916,7 @@ reversible operation.

diff --git a/git-pack-objects.html b/git-pack-objects.html index 7d552499c..c4979609d 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -530,6 +530,8 @@ base-name This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly.

@@ -564,7 +566,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 8353be186..5c1bd3b08 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -177,6 +177,8 @@ base-name:: This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly. --index-version=[,]:: This is intended to be used by the test suite only. It allows diff --git a/git-pull.html b/git-pull.html index 0cc70849b..e6d2f821f 100644 --- a/git-pull.html +++ b/git-pull.html @@ -705,6 +705,24 @@ file:///path/to/repo.git/

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

+

If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:

+
+
+
        [url "<actual url base>"]
+                insteadOf = <other url base>
+
+

For example, with this:

+
+
+
        [url "git://git.host.xz/"]
+                insteadOf = host.xz:/path/to/
+                insteadOf = work:
+
+

a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".

REMOTES

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

diff --git a/git-push.html b/git-push.html index 6ada41e4a..0f3679b3f 100644 --- a/git-push.html +++ b/git-push.html @@ -522,6 +522,24 @@ file:///path/to/repo.git/

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

+

If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:

+
+
+
        [url "<actual url base>"]
+                insteadOf = <other url base>
+
+

For example, with this:

+
+
+
        [url "git://git.host.xz/"]
+                insteadOf = host.xz:/path/to/
+                insteadOf = work:
+
+

a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".

REMOTES

@@ -709,7 +727,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-rev-list.html b/git-rev-list.html index 0173f66cc..bf709ac5a 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -295,6 +295,7 @@ git-rev-list(1) Manual Page [ --(author|committer|grep)=<pattern> ] [ --regexp-ignore-case | \-i ] [ --extended-regexp | \-E ] + [ --fixed-strings | \-F ] [ --date={local|relative|default|iso|rfc|short} ] [ [--objects | --objects-edge] [ --unpacked ] ] [ --pretty | --header ] @@ -596,6 +597,15 @@ limiting may be applied.

+-F, --fixed-strings +
+
+

+ Consider the limiting patterns to be fixed strings (don't interpret + pattern as a regular expression). +

+
+
--remove-empty
@@ -1191,7 +1201,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 5b96eabfc..a8d489f9f 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -31,6 +31,7 @@ SYNOPSIS [ \--(author|committer|grep)= ] [ \--regexp-ignore-case | \-i ] [ \--extended-regexp | \-E ] + [ \--fixed-strings | \-F ] [ \--date={local|relative|default|iso|rfc|short} ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] diff --git a/git-svn.html b/git-svn.html index dca6f71be..c5b2af3a3 100644 --- a/git-svn.html +++ b/git-svn.html @@ -553,6 +553,16 @@ and have no uncommitted changes.

+
+ + + +
+
Note
+		SVN itself only stores times in UTC and nothing else. The regular svn +client converts the UTC time to the local time (or based on the TZ= +environment). This command has the same behaviour.
+

Any other arguments are passed directly to `git log'

@@ -1085,7 +1095,7 @@ should be manually entered with a text-editor or using diff --git a/git-svn.txt b/git-svn.txt index 340f1be02..bec9accc8 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -159,6 +159,10 @@ New features: our version of --pretty=oneline -- + +NOTE: SVN itself only stores times in UTC and nothing else. The regular svn +client converts the UTC time to the local time (or based on the TZ= +environment). This command has the same behaviour. ++ Any other arguments are passed directly to `git log' 'blame':: diff --git a/rev-list-options.txt b/rev-list-options.txt index a8138e27a..259072c07 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -153,6 +153,11 @@ limiting may be applied. Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions. +-F, --fixed-strings:: + + Consider the limiting patterns to be fixed strings (don't interpret + pattern as a regular expression). + --remove-empty:: Stop when a given path disappears from the tree. diff --git a/urls.txt b/urls.txt index 81ac17f32..fa34c6747 100644 --- a/urls.txt +++ b/urls.txt @@ -44,3 +44,26 @@ endif::git-clone[] ifdef::git-clone[] They are equivalent, except the former implies --local option. endif::git-clone[] + + +If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form: + +------------ + [url ""] + insteadOf = +------------ + +For example, with this: + +------------ + [url "git://git.host.xz/"] + insteadOf = host.xz:/path/to/ + insteadOf = work: +------------ + +a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git". + -- 2.26.2