From a129545d44f1f0fe9976ed87b9a7331bf239b7d8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 13 Nov 2012 14:32:04 -0800 Subject: [PATCH] Autogenerated HTML docs for v1.8.0-150-gb0b00 --- config.txt | 8 ++++---- diff-config.txt | 4 ++++ git-clone.html | 6 +++--- git-clone.txt | 4 ++-- git-commit.html | 24 ++++++++++++++++++++++-- git-commit.txt | 10 +++++++++- git-config.html | 27 +++++++++++++++++++++------ git-log.html | 18 ++++++++++++++++++ git-merge.html | 8 ++++---- git-merge.txt | 2 +- git-push.html | 4 ++-- git-push.txt | 2 +- git-remote-helpers.html | 27 +++++++++++++++++++++++++-- git-remote-helpers.txt | 21 ++++++++++++++++++++- git-reset.html | 10 +++++----- git-reset.txt | 8 ++++---- git-rev-list.html | 18 ++++++++++++++++++ git-rm.html | 14 +++++++++++++- git-rm.txt | 15 +++++++++++++++ git-send-email.html | 11 ++++++++++- git-send-email.txt | 4 ++++ git-status.html | 10 +++++++++- git-status.txt | 3 +++ git-submodule.html | 14 ++++++++++++-- git-submodule.txt | 7 ++++++- git-svn.html | 14 +++++++++++++- git-svn.txt | 7 +++++++ gitattributes.html | 5 +++-- gitattributes.txt | 1 + gitmodules.html | 6 ++++-- gitmodules.txt | 4 +++- gitrepository-layout.html | 13 ++++++++++++- gitrepository-layout.txt | 6 ++++++ merge-config.txt | 4 ++-- rev-list-options.txt | 10 ++++++++++ technical/api-argv-array.html | 20 +++++++++++++++++++- technical/api-argv-array.txt | 8 ++++++++ 37 files changed, 323 insertions(+), 54 deletions(-) diff --git a/config.txt b/config.txt index 11f320b96..9a0544cf1 100644 --- a/config.txt +++ b/config.txt @@ -538,14 +538,14 @@ core.pager:: `LESS` variable to some other value. Alternately, these settings can be overridden on a project or global basis by setting the `core.pager` option. - Setting `core.pager` has no affect on the `LESS` + Setting `core.pager` has no effect on the `LESS` environment variable behaviour above, so if you want to override git's default settings this way, you need to be explicit. For example, to disable the S option in a backward compatible manner, set `core.pager` - to `less -+$LESS -FRX`. This will be passed to the - shell by git, which will translate the final command to - `LESS=FRSX less -+FRSX -FRX`. + to `less -+S`. This will be passed to the shell by + git, which will translate the final command to + `LESS=FRSX less -+S`. core.whitespace:: A comma separated list of common whitespace problems to diff --git a/diff-config.txt b/diff-config.txt index 67a90a828..75ab8a51c 100644 --- a/diff-config.txt +++ b/diff-config.txt @@ -56,6 +56,10 @@ diff.statGraphWidth:: Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch. +diff.context:: + Generate diffs with lines of context instead of the default of + 3. This value is overridden by the -U option. + diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the diff --git a/git-clone.html b/git-clone.html index 2e81d8d1f..8fc7d782a 100644 --- a/git-clone.html +++ b/git-clone.html @@ -865,9 +865,9 @@

OPTIONS

--no-single-branch is given to fetch the histories near the tips of all branches. Further fetches into the resulting repository will only update the - remote tracking branch for the branch this option was used for the + remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any - branch when --single-branch clone was made, no remote tracking + branch when --single-branch clone was made, no remote-tracking branch is created.

@@ -1118,7 +1118,7 @@

GIT

diff --git a/git-clone.txt b/git-clone.txt index 6d98ef3d2..7fefdb038 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -196,9 +196,9 @@ objects from the source repository into a pack in the cloned repository. `--no-single-branch` is given to fetch the histories near the tips of all branches. Further fetches into the resulting repository will only update the - remote tracking branch for the branch this option was used for the + remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any - branch when `--single-branch` clone was made, no remote tracking + branch when `--single-branch` clone was made, no remote-tracking branch is created. --recursive:: diff --git a/git-commit.html b/git-commit.html index 69aae05aa..6e0d1af40 100644 --- a/git-commit.html +++ b/git-commit.html @@ -588,7 +588,7 @@

SYNOPSIS

[-F <file> | -m <msg>] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] [--status | --no-status] - [-i | -o] [--] [<file>…] + [-i | -o] [-S[<keyid>]] [--] [<file>…]
@@ -759,6 +759,15 @@

OPTIONS

+--long +
+
+

+ When doing a dry-run, give the output in a the long-format. + Implies --dry-run. +

+
+
-z
@@ -1069,6 +1078,17 @@

OPTIONS

+-S[<keyid>] +
+
+--gpg-sign[=<keyid>] +
+
+

+ GPG-sign commit. +

+
+
--
@@ -1349,7 +1369,7 @@

GIT

diff --git a/git-commit.txt b/git-commit.txt index 9594ac8e9..029589062 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -13,7 +13,7 @@ SYNOPSIS [-F | -m ] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=] [--date=] [--cleanup=] [--status | --no-status] - [-i | -o] [--] [...] + [-i | -o] [-S[]] [--] [...] DESCRIPTION ----------- @@ -109,6 +109,10 @@ OPTIONS format. See linkgit:git-status[1] for details. Implies `--dry-run`. +--long:: + When doing a dry-run, give the output in a the long-format. + Implies `--dry-run`. + -z:: --null:: When showing `short` or `porcelain` status output, terminate @@ -276,6 +280,10 @@ configuration variable documented in linkgit:git-config[1]. commit message template when using an editor to prepare the default commit message. +-S[]:: +--gpg-sign[=]:: + GPG-sign commit. + \--:: Do not interpret any more arguments as options. diff --git a/git-config.html b/git-config.html index 7b9cd4b3f..5e359a60c 100644 --- a/git-config.html +++ b/git-config.html @@ -1805,14 +1805,14 @@

Variables

LESS variable to some other value. Alternately, these settings can be overridden on a project or global basis by setting the core.pager option. - Setting core.pager has no affect on the LESS + Setting core.pager has no effect on the LESS environment variable behaviour above, so if you want to override git’s default settings this way, you need to be explicit. For example, to disable the S option in a backward compatible manner, set core.pager - to less -+$LESS -FRX. This will be passed to the - shell by git, which will translate the final command to - LESS=FRSX less -+FRSX -FRX. + to less -+S. This will be passed to the shell by + git, which will translate the final command to + LESS=FRSX less -+S.

@@ -2652,6 +2652,21 @@

Variables

+diff.context +
+
+

+ Generate diffs with <n> lines of context instead of the default of +

+
    +
  1. +

    +This value is overridden by the -U option. +

    +
    2. +
+
+
diff.external
@@ -3968,11 +3983,11 @@

Variables

If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last - observed values stored in their remote tracking branches. + observed values stored in their remote-tracking branches. The values of the branch.<current branch>.merge that name the branches at the remote named by branch.<current branch>.remote are consulted, and then they are mapped via remote.<remote>.fetch - to their corresponding remote tracking branches, and the tips of + to their corresponding remote-tracking branches, and the tips of these tracking branches are merged.

diff --git a/git-log.html b/git-log.html index 702d3855c..111b7071b 100644 --- a/git-log.html +++ b/git-log.html @@ -800,6 +800,15 @@

Commit Limiting

+--basic-regexp +
+
+

+ Consider the limiting patterns to be basic regular expressions; + this is the default. +

+
+
-E
@@ -824,6 +833,15 @@

Commit Limiting

+--perl-regexp +
+
+

+ Consider the limiting patterns to be Perl-compatible regexp. + Requires libpcre to be compiled in. +

+
+
--remove-empty
diff --git a/git-merge.html b/git-merge.html index a8981b89a..753bd8209 100644 --- a/git-merge.html +++ b/git-merge.html @@ -878,7 +878,7 @@

OPTIONS

more than two parents (affectionately called an Octopus merge).

If no commit is given from the command line, and if merge.defaultToUpstream -configuration variable is set, merge the remote tracking branches +configuration variable is set, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page.

@@ -1325,11 +1325,11 @@

CONFIGURATION

If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last - observed values stored in their remote tracking branches. + observed values stored in their remote-tracking branches. The values of the branch.<current branch>.merge that name the branches at the remote named by branch.<current branch>.remote are consulted, and then they are mapped via remote.<remote>.fetch - to their corresponding remote tracking branches, and the tips of + to their corresponding remote-tracking branches, and the tips of these tracking branches are merged.

@@ -1476,7 +1476,7 @@

GIT

diff --git a/git-merge.txt b/git-merge.txt index 20f922851..d34ea3c50 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'. more than two parents (affectionately called an Octopus merge). + If no commit is given from the command line, and if `merge.defaultToUpstream` -configuration variable is set, merge the remote tracking branches +configuration variable is set, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page. diff --git a/git-push.html b/git-push.html index 9bb577791..be0f30581 100644 --- a/git-push.html +++ b/git-push.html @@ -845,7 +845,7 @@

OPTIONS

Make sure all submodule commits used by the revisions to be - pushed are available on a remote tracking branch. If check is + pushed are available on a remote-tracking branch. If check is used git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be @@ -1430,7 +1430,7 @@

GIT

diff --git a/git-push.txt b/git-push.txt index 22d258012..fe46c4258 100644 --- a/git-push.txt +++ b/git-push.txt @@ -175,7 +175,7 @@ useful if you write an alias or script around 'git push'. --recurse-submodules=check|on-demand:: Make sure all submodule commits used by the revisions to be - pushed are available on a remote tracking branch. If 'check' is + pushed are available on a remote-tracking branch. If 'check' is used git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be diff --git a/git-remote-helpers.html b/git-remote-helpers.html index dbb1af6fd..4111c7e35 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -695,6 +695,25 @@

Capabilities

the list command. If no refspec capability is advertised, there is an implied refspec *:*.

+
+bidi-import +
+
+

+ The fast-import commands cat-blob and ls can be used by remote-helpers + to retrieve information about blobs and trees that already exist in + fast-import’s memory. This requires a channel from fast-import to the + remote-helper. + If it is advertised in addition to "import", git establishes a pipe from + fast-import to the remote-helper’s stdin. + It follows that git and fast-import are both connected to the + remote-helper’s stdin. Because git can send multiple commands to + the remote-helper it is required that helpers that use bidi-import + buffer all import commands of a batch before sending data to fast-import. + This is to prevent mixing commands and fast-import responses on the + helper’s stdin. +

+

Capabilities for Pushing

@@ -925,7 +944,11 @@

COMMANDS

terminated with a blank line. For each batch of import, the remote helper should produce a fast-import stream terminated by a done command.

-

Supported if the helper has the "import" capability.

+

Note that if the bidi-import capability is used the complete batch +sequence has to be buffered before starting to send data to fast-import +to prevent mixing of commands and fast-import responses on the helper’s +stdin.

+

Supported if the helper has the import capability.

connect <service> @@ -1055,7 +1078,7 @@

GIT

diff --git a/git-remote-helpers.txt b/git-remote-helpers.txt index f5836e46d..5ce4cda8e 100644 --- a/git-remote-helpers.txt +++ b/git-remote-helpers.txt @@ -98,6 +98,20 @@ advertised with this capability must cover all refs reported by the list command. If no 'refspec' capability is advertised, there is an implied `refspec *:*`. +'bidi-import':: + The fast-import commands 'cat-blob' and 'ls' can be used by remote-helpers + to retrieve information about blobs and trees that already exist in + fast-import's memory. This requires a channel from fast-import to the + remote-helper. + If it is advertised in addition to "import", git establishes a pipe from + fast-import to the remote-helper's stdin. + It follows that git and fast-import are both connected to the + remote-helper's stdin. Because git can send multiple commands to + the remote-helper it is required that helpers that use 'bidi-import' + buffer all 'import' commands of a batch before sending data to fast-import. + This is to prevent mixing commands and fast-import responses on the + helper's stdin. + Capabilities for Pushing ~~~~~~~~~~~~~~~~~~~~~~~~ 'connect':: @@ -286,7 +300,12 @@ terminated with a blank line. For each batch of 'import', the remote helper should produce a fast-import stream terminated by a 'done' command. + -Supported if the helper has the "import" capability. +Note that if the 'bidi-import' capability is used the complete batch +sequence has to be buffered before starting to send data to fast-import +to prevent mixing of commands and fast-import responses on the helper's +stdin. ++ +Supported if the helper has the 'import' capability. 'connect' :: Connects to given service. Standard input and standard output diff --git a/git-reset.html b/git-reset.html index 2035c076f..4a84aad9c 100644 --- a/git-reset.html +++ b/git-reset.html @@ -585,7 +585,7 @@

SYNOPSIS

git reset [-q] [<commit>] [--] <paths>… git reset (--patch | -p) [<commit>] [--] [<paths>…] -git reset (--soft | --mixed | --hard | --merge | --keep) [-q] [<commit>]
+git reset [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
@@ -628,14 +628,14 @@

DESCRIPTION

section of linkgit:git-add[1] to learn how to operate the `--patch mode.

-git reset --<mode> [<commit>] +git reset [<mode>] [<commit>]

This form resets the current branch head to <commit> and possibly updates the index (resetting it to the tree of <commit>) and - the working tree depending on <mode>, which - must be one of the following: + the working tree depending on <mode>. If <mode> is omitted, + defaults to "--mixed". The <mode> must be one of the following:

@@ -1171,7 +1171,7 @@

GIT

diff --git a/git-reset.txt b/git-reset.txt index 117e3743a..978d8da50 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git reset' [-q] [] [--] ... 'git reset' (--patch | -p) [] [--] [...] -'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] [] +'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [] DESCRIPTION ----------- @@ -43,11 +43,11 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e. you can use it to selectively reset hunks. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode. -'git reset' -- []:: +'git reset' [] []:: This form resets the current branch head to and possibly updates the index (resetting it to the tree of ) and - the working tree depending on , which - must be one of the following: + the working tree depending on . If is omitted, + defaults to "--mixed". The must be one of the following: + -- --soft:: diff --git a/git-rev-list.html b/git-rev-list.html index 6771ce05c..a46413c8d 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -804,6 +804,15 @@

Commit Limiting

+--basic-regexp +
+
+

+ Consider the limiting patterns to be basic regular expressions; + this is the default. +

+
+
-E
@@ -828,6 +837,15 @@

Commit Limiting

+--perl-regexp +
+
+

+ Consider the limiting patterns to be Perl-compatible regexp. + Requires libpcre to be compiled in. +

+
+
--remove-empty
diff --git a/git-rm.html b/git-rm.html index 19cbbf5c4..4df21a28a 100644 --- a/git-rm.html +++ b/git-rm.html @@ -723,6 +723,18 @@

Using “git add -A”

Typically you would first remove all tracked files from the working tree using this command:

+

Submodules

+

Only submodules using a gitfile (which means they were cloned +with a git version 1.7.8 or newer) will be removed from the work +tree, as their repository lives inside the .git directory of the +superproject. If a submodule (or one of those nested inside it) +still uses a .git directory, git rm will fail - no matter if forced +or not - to protect the submodule’s history.

+

A submodule is considered up-to-date when the HEAD is the same as +recorded in the index, no tracked files are modified and no untracked +files that aren’t ignored are present in the submodules work tree. +Ignored files are deemed expendable and won’t stop a submodule’s work +tree from being removed.

git ls-files -z | xargs -0 rm -f
@@ -785,7 +797,7 @@

GIT

diff --git a/git-rm.txt b/git-rm.txt index 5d31860eb..882cb1171 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -107,6 +107,21 @@ as well as modifications of existing paths. Typically you would first remove all tracked files from the working tree using this command: +Submodules +~~~~~~~~~~ +Only submodules using a gitfile (which means they were cloned +with a git version 1.7.8 or newer) will be removed from the work +tree, as their repository lives inside the .git directory of the +superproject. If a submodule (or one of those nested inside it) +still uses a .git directory, `git rm` will fail - no matter if forced +or not - to protect the submodule's history. + +A submodule is considered up-to-date when the HEAD is the same as +recorded in the index, no tracked files are modified and no untracked +files that aren't ignored are present in the submodules work tree. +Ignored files are deemed expendable and won't stop a submodule's work +tree from being removed. + ---------------- git ls-files -z | xargs -0 rm -f ---------------- diff --git a/git-send-email.html b/git-send-email.html index 72f4e2495..9a6af3da7 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -740,6 +740,15 @@

Composing

Note that no attempts whatsoever are made to validate the encoding.

+
+--compose-encoding=<encoding> +
+
+

+ Specify encoding of compose message. Default is the value of the + sendemail.composeencoding; if that is unspecified, UTF-8 is assumed. +

+

Sending

@@ -1190,7 +1199,7 @@

GIT

diff --git a/git-send-email.txt b/git-send-email.txt index 324117072..eeb561cf1 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -126,6 +126,10 @@ The --to option must be repeated for each user you want on the to list. + Note that no attempts whatsoever are made to validate the encoding. +--compose-encoding=:: + Specify encoding of compose message. Default is the value of the + 'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed. + Sending ~~~~~~~ diff --git a/git-status.html b/git-status.html index bcd90f06f..81c9a5458 100644 --- a/git-status.html +++ b/git-status.html @@ -634,6 +634,14 @@

OPTIONS

+--long +
+
+

+ Give the output in the long-format. This is the default. +

+
+
-u[<mode>]
@@ -874,7 +882,7 @@

GIT

diff --git a/git-status.txt b/git-status.txt index 67e5f53a9..9f1ef9a46 100644 --- a/git-status.txt +++ b/git-status.txt @@ -38,6 +38,9 @@ OPTIONS across git versions and regardless of user configuration. See below for details. +--long:: + Give the output in the long-format. This is the default. + -u[]:: --untracked-files[=]:: Show untracked files. diff --git a/git-submodule.html b/git-submodule.html index bd279d954..ba3d838f3 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -583,7 +583,7 @@

NAME

SYNOPSIS

-
git submodule [--quiet] add [-b branch] [-f|--force] +
git submodule [--quiet] add [-b branch] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>] git submodule [--quiet] status [--cached] [--recursive] [--] [<path>…] git submodule [--quiet] init [--] [<path>…] @@ -924,6 +924,16 @@

OPTIONS

+--name +
+
+

+ This option is only valid for the add command. It sets the submodule’s + name to the given string instead of defaulting to its path. The name + must be valid as a directory name and may not end with a /. +

+
+
--reference <repository>
@@ -974,7 +984,7 @@

GIT

diff --git a/git-submodule.txt b/git-submodule.txt index b4683bba1..1d6527ab9 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -9,7 +9,7 @@ git-submodule - Initialize, update or inspect submodules SYNOPSIS -------- [verse] -'git submodule' [--quiet] add [-b branch] [-f|--force] +'git submodule' [--quiet] add [-b branch] [-f|--force] [--name ] [--reference ] [--] [] 'git submodule' [--quiet] status [--cached] [--recursive] [--] [...] 'git submodule' [--quiet] init [--] [...] @@ -265,6 +265,11 @@ OPTIONS Initialize all submodules for which "git submodule init" has not been called so far before updating. +--name:: + This option is only valid for the add command. It sets the submodule's + name to the given string instead of defaulting to its path. The name + must be valid as a directory name and may not end with a '/'. + --reference :: This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, diff --git a/git-svn.html b/git-svn.html index 343dbef34..dcb0ba833 100644 --- a/git-svn.html +++ b/git-svn.html @@ -825,6 +825,18 @@

COMMANDS

+
+--log-window-size=<n> +
+
+

+ Fetch <n> log entries per request when scanning Subversion history. + The default is 100. For very large Subversion repositories, larger + values may be needed for clone/fetch to complete in reasonable + time. But overly large values may lead to higher memory usage and + request timeouts. +

+
@@ -2008,7 +2020,7 @@

GIT

diff --git a/git-svn.txt b/git-svn.txt index cfe8d2b5d..8b0d3adfe 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -146,6 +146,13 @@ Skip "branches" and "tags" of first level directories;; ------------------------------------------------------------------------ -- +--log-window-size=;; + Fetch log entries per request when scanning Subversion history. + The default is 100. For very large Subversion repositories, larger + values may be needed for 'clone'/'fetch' to complete in reasonable + time. But overly large values may lead to higher memory usage and + request timeouts. + 'clone':: Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; diff --git a/gitattributes.html b/gitattributes.html index ff7fc1488..5cc30f485 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -644,7 +644,8 @@

DESCRIPTION

When more than one pattern matches the path, a later line overrides an earlier line. This overriding is done per attribute. The rules how the pattern matches paths are the -same as in .gitignore files; see gitignore(5).

+same as in .gitignore files; see gitignore(5). +Unlike .gitignore, negative patterns are forbidden.

When deciding what attributes are assigned to a path, git consults $GIT_DIR/info/attributes file (which has the highest precedence), .gitattributes file in the same directory as the @@ -1609,7 +1610,7 @@

GIT

diff --git a/gitattributes.txt b/gitattributes.txt index ba02d4de5..2698f63cf 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -56,6 +56,7 @@ When more than one pattern matches the path, a later line overrides an earlier line. This overriding is done per attribute. The rules how the pattern matches paths are the same as in `.gitignore` files; see linkgit:gitignore[5]. +Unlike `.gitignore`, negative patterns are forbidden. When deciding what attributes are assigned to a path, git consults `$GIT_DIR/info/attributes` file (which has the highest diff --git a/gitmodules.html b/gitmodules.html index e9d391235..f0ac62bf8 100644 --- a/gitmodules.html +++ b/gitmodules.html @@ -590,7 +590,9 @@

DESCRIPTION

working tree, is a text file with a syntax matching the requirements of git-config(1).

The file contains one subsection per submodule, and the subsection value -is the name of the submodule. Each submodule section also contains the +is the name of the submodule. The name is set to the path where the +submodule has been added unless it was customized with the --name +option of git submodule add. Each submodule section also contains the following required keys:

@@ -702,7 +704,7 @@

GIT

diff --git a/gitmodules.txt b/gitmodules.txt index 4effd7890..ab3e91c05 100644 --- a/gitmodules.txt +++ b/gitmodules.txt @@ -18,7 +18,9 @@ working tree, is a text file with a syntax matching the requirements of linkgit:git-config[1]. The file contains one subsection per submodule, and the subsection value -is the name of the submodule. Each submodule section also contains the +is the name of the submodule. The name is set to the path where the +submodule has been added unless it was customized with the '--name' +option of 'git submodule add'. Each submodule section also contains the following required keys: submodule..path:: diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 85990ecf9..9cfb6da03 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html @@ -732,6 +732,17 @@

DESCRIPTION

+refs/replace/<obj-sha1> +
+
+

+ records the SHA1 of the object that replaces <obj-sha1>. + This is similar to info/grafts and is internally used and + maintained by git-replace(1). Such refs can be exchanged + between repositories while grafts are not. +

+
+
packed-refs
@@ -917,7 +928,7 @@

GIT

diff --git a/gitrepository-layout.txt b/gitrepository-layout.txt index 5c891f116..9f628862b 100644 --- a/gitrepository-layout.txt +++ b/gitrepository-layout.txt @@ -93,6 +93,12 @@ refs/remotes/`name`:: records tip-of-the-tree commit objects of branches copied from a remote repository. +refs/replace/``:: + records the SHA1 of the object that replaces ``. + This is similar to info/grafts and is internally used and + maintained by linkgit:git-replace[1]. Such refs can be exchanged + between repositories while grafts are not. + packed-refs:: records the same information as refs/heads/, refs/tags/, and friends record in a more efficient way. See diff --git a/merge-config.txt b/merge-config.txt index 861bd6f55..9bb4956cc 100644 --- a/merge-config.txt +++ b/merge-config.txt @@ -9,11 +9,11 @@ merge.conflictstyle:: merge.defaultToUpstream:: If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last - observed values stored in their remote tracking branches. + observed values stored in their remote-tracking branches. The values of the `branch..merge` that name the branches at the remote named by `branch..remote` are consulted, and then they are mapped via `remote..fetch` - to their corresponding remote tracking branches, and the tips of + to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. merge.ff:: diff --git a/rev-list-options.txt b/rev-list-options.txt index ee497430c..1ec14a068 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -79,6 +79,11 @@ if it is part of the log message. Match the regexp limiting patterns without regard to letters case. +--basic-regexp:: + + Consider the limiting patterns to be basic regular expressions; + this is the default. + -E:: --extended-regexp:: @@ -91,6 +96,11 @@ if it is part of the log message. Consider the limiting patterns to be fixed strings (don't interpret pattern as a regular expression). +--perl-regexp:: + + Consider the limiting patterns to be Perl-compatible regexp. + Requires libpcre to be compiled in. + --remove-empty:: Stop when a given path disappears from the tree. diff --git a/technical/api-argv-array.html b/technical/api-argv-array.html index 10c273b99..3a0a7c4e0 100644 --- a/technical/api-argv-array.html +++ b/technical/api-argv-array.html @@ -644,13 +644,31 @@

Functions

initial, empty state.

+
+argv_array_detach +
+
+

+ Detach the argv array from the struct argv_array, transfering + ownership of the allocated array and strings. +

+
+
+argv_array_free_detached +
+
+

+ Free the memory allocated by a struct argv_array that was later + detached and is now no longer needed. +

+
diff --git a/technical/api-argv-array.txt b/technical/api-argv-array.txt index 1a797812f..a959517b2 100644 --- a/technical/api-argv-array.txt +++ b/technical/api-argv-array.txt @@ -53,3 +53,11 @@ Functions `argv_array_clear`:: Free all memory associated with the array and return it to the initial, empty state. + +`argv_array_detach`:: + Detach the argv array from the `struct argv_array`, transfering + ownership of the allocated array and strings. + +`argv_array_free_detached`:: + Free the memory allocated by a `struct argv_array` that was later + detached and is now no longer needed.