From bb34317b8b0b3c34f91f17697ad618fe19148f7b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 9 Mar 2008 10:39:09 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.4-481-g5075 --- RelNotes-1.5.4.4.txt | 32 ++++++++++++++++++++++++++------ RelNotes-1.5.5.txt | 4 ---- git-am.html | 13 ++----------- git-am.txt | 6 +----- git-fetch-pack.html | 15 +++++++++++++-- git-fetch-pack.txt | 8 +++++++- git-mergetool.html | 37 ++++++++++++++++++++++++++++--------- git-mergetool.txt | 38 ++++++++++++++++++++++++++++++-------- git-pack-objects.html | 12 +++++++++++- git-pack-objects.txt | 5 +++++ git-rev-parse.html | 34 ++++++++++++++++++++++++++++------ git-rev-parse.txt | 17 ++++++++++++----- git-submodule.html | 7 ++++--- git-submodule.txt | 5 +++-- git.html | 2 +- git.txt | 3 ++- 16 files changed, 173 insertions(+), 65 deletions(-) diff --git a/RelNotes-1.5.4.4.txt b/RelNotes-1.5.4.4.txt index 5635977c9..89fa6d03b 100644 --- a/RelNotes-1.5.4.4.txt +++ b/RelNotes-1.5.4.4.txt @@ -37,10 +37,30 @@ Fixes since v1.5.4.3 * "git revert" did not properly fail when attempting to run with a dirty index. -Also included are a handful documentation updates. + * "git merge --no-commit --no-ff " incorrectly made commits. + + * "git merge --squash --no-ff ", which is a nonsense combination + of options, was not rejected. + + * "git ls-remote" and "git remote show" against an empty repository + failed, instead of just giving an empty result (regression). + + * "git fast-import" did not handle a renamed path whose name needs to be + quoted, due to a bug in unquote_c_style() function. + + * "git cvsexportcommit" was confused when multiple files with the same + basename needed to be pushed out in the same commit. + + * "git daemon" did not send early errors to syslog. ---- -exec >/var/tmp/1 -echo O=$(git describe maint) -O=v1.5.4.3-32-g0f2d447 -git shortlog --no-merges $O..maint + * "git log --merge" did not work well with --left-right option. + + * "git svn" promprted for client cert password every time it accessed the + server. + + * The reset command in "git fast-import" data stream was documented to + end with an optional LF, but it actually required one. + + * "git svn dcommit/rebase" did not honor --rewrite-root option. + +Also included are a handful documentation updates. diff --git a/RelNotes-1.5.5.txt b/RelNotes-1.5.5.txt index b57fa1eb1..874dad9a4 100644 --- a/RelNotes-1.5.5.txt +++ b/RelNotes-1.5.5.txt @@ -160,13 +160,9 @@ Fixes since v1.5.4 All of the fixes in v1.5.4 maintenance series are included in this release, unless otherwise noted. - * "git-daemon" did not send early errors to syslog. - * "git-http-push" did not allow deletion of remote ref with the usual "push :" syntax. - * "git-log --merge" did not well work with --left-right option. - * "git-rebase --abort" did not go back to the right location if "git-reset" was run during the "git-rebase" session. diff --git a/git-am.html b/git-am.html index bfa9169ad..ba1302efe 100644 --- a/git-am.html +++ b/git-am.html @@ -273,7 +273,7 @@ git-am(1) Manual Page

SYNOPSIS

-
git-am [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8] +
git-am [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>|<Maildir>… @@ -308,15 +308,6 @@ current branch.

--d=<dir>, --dotest=<dir> -
-
-

- Instead of .dotest directory, use <dir> as a working - area to store extracted patches. -

-
-
-k, --keep
@@ -509,7 +500,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index e640fc75c..2387a8d6c 100644 --- a/git-am.txt +++ b/git-am.txt @@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox SYNOPSIS -------- [verse] -'git-am' [--signoff] [--dotest=] [--keep] [--utf8 | --no-utf8] +'git-am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=

SYNOPSIS

-

git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>…]

+

git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>…]

DESCRIPTION

@@ -328,6 +328,17 @@ have a common ancestor commit.

+--include-tag +
+
+

+ If the remote side supports it, annotated tags objects will + be downloaded on the same connection as the other objects if + the object the tag references is downloaded. The caller must + otherwise determine the tags this option made available. +

+
+
--upload-pack=<git-upload-pack>
@@ -420,7 +431,7 @@ have a common ancestor commit.

diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 2b8ffe532..57598eb05 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt @@ -8,7 +8,7 @@ git-fetch-pack - Receive missing objects from another repository SYNOPSIS -------- -'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=] [--depth=] [--no-progress] [-v] [:] [...] +'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=] [--depth=] [--no-progress] [-v] [:] [...] DESCRIPTION ----------- @@ -45,6 +45,12 @@ OPTIONS Spend extra cycles to minimize the number of objects to be sent. Use it on slower connection. +\--include-tag:: + If the remote side supports it, annotated tags objects will + be downloaded on the same connection as the other objects if + the object the tag references is downloaded. The caller must + otherwise determine the tags this option made available. + \--upload-pack=:: Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. diff --git a/git-mergetool.html b/git-mergetool.html index 51db618f8..e4d4704a1 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -276,11 +276,11 @@ git-mergetool(1) Manual Page

DESCRIPTION

-

Use git mergetool to run one of several merge utilities to resolve +

Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git-merge(1).

If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file. If no <file> names are -specified, git mergetool will run the merge tool program on every file +specified, git mergetool will run the merge tool program on every file with merge conflicts.

OPTIONS

@@ -295,15 +295,34 @@ with merge conflicts.

Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff

-

If a merge resolution program is not specified, git mergetool -will use the configuration variable merge.tool. If the -configuration variable merge.tool is not set, git mergetool +

If a merge resolution program is not specified, git mergetool +will use the configuration variable merge.tool. If the +configuration variable merge.tool is not set, git mergetool will pick a suitable default.

You can explicitly provide a full path to the tool by setting the -configuration variable mergetool.<tool>.path. For example, you +configuration variable mergetool.<tool>.path. For example, you can configure the absolute path to kdiff3 by setting -mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool -is available in PATH.

+mergetool.kdiff3.path. Otherwise, git mergetool assumes the +tool is available in PATH.

+

Instead of running one of the known merge tool programs +git mergetool can be customized to run an alternative program +by specifying the command line to invoke in a configration +variable mergetool.<tool>.cmd.

+

When git mergetool is invoked with this tool (either through the +-t or --tool option or the merge.tool configuration +variable) the configured command line will be invoked with $BASE +set to the name of a temporary file containing the common base for +the merge, if available; $LOCAL set to the name of a temporary +file containing the contents of the file on the current branch; +$REMOTE set to the name of a temporary file containing the +contents of the file to be merged, and $MERGED set to the name +of the file to which the merge tool should write the result of the +merge resolution.

+

If the custom merge tool correctly indicates the success of a +merge resolution with its exit code then the configuration +variable mergetool.<tool>.trustExitCode can be set to true. +Otherwise, git mergetool will prompt the user to indicate the +success of the resolution after the custom tool has exited.

@@ -321,7 +340,7 @@ is available in PATH.

diff --git a/git-mergetool.txt b/git-mergetool.txt index 50f106ec5..8ed44947e 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -12,12 +12,12 @@ SYNOPSIS DESCRIPTION ----------- -Use 'git mergetool' to run one of several merge utilities to resolve +Use `git mergetool` to run one of several merge utilities to resolve merge conflicts. It is typically run after linkgit:git-merge[1]. If one or more parameters are given, the merge tool program will be run to resolve differences on each file. If no names are -specified, 'git mergetool' will run the merge tool program on every file +specified, `git mergetool` will run the merge tool program on every file with merge conflicts. OPTIONS @@ -27,16 +27,38 @@ OPTIONS Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + -If a merge resolution program is not specified, 'git mergetool' -will use the configuration variable merge.tool. If the -configuration variable merge.tool is not set, 'git mergetool' +If a merge resolution program is not specified, `git mergetool` +will use the configuration variable `merge.tool`. If the +configuration variable `merge.tool` is not set, `git mergetool` will pick a suitable default. + You can explicitly provide a full path to the tool by setting the -configuration variable mergetool..path. For example, you +configuration variable `mergetool..path`. For example, you can configure the absolute path to kdiff3 by setting -mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool -is available in PATH. +`mergetool.kdiff3.path`. Otherwise, `git mergetool` assumes the +tool is available in PATH. ++ +Instead of running one of the known merge tool programs +`git mergetool` can be customized to run an alternative program +by specifying the command line to invoke in a configration +variable `mergetool..cmd`. ++ +When `git mergetool` is invoked with this tool (either through the +`-t` or `--tool` option or the `merge.tool` configuration +variable) the configured command line will be invoked with `$BASE` +set to the name of a temporary file containing the common base for +the merge, if available; `$LOCAL` set to the name of a temporary +file containing the contents of the file on the current branch; +`$REMOTE` set to the name of a temporary file containing the +contents of the file to be merged, and `$MERGED` set to the name +of the file to which the merge tool should write the result of the +merge resolution. ++ +If the custom merge tool correctly indicates the success of a +merge resolution with its exit code then the configuration +variable `mergetool..trustExitCode` can be set to `true`. +Otherwise, `git mergetool` will prompt the user to indicate the +success of the resolution after the custom tool has exited. Author ------ diff --git a/git-pack-objects.html b/git-pack-objects.html index c4979609d..59edf37b7 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -358,6 +358,16 @@ base-name

+--include-tag +
+
+

+ Include unasked-for annotated tags if the object they + reference was included in the resulting packfile. This + can be useful to send new tags to native git clients. +

+
+
--window=[N], --depth=[N]
@@ -566,7 +576,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 5c1bd3b08..eed0a94c6 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -73,6 +73,11 @@ base-name:: as if all refs under `$GIT_DIR/refs` are specified to be included. +--include-tag:: + Include unasked-for annotated tags if the object they + reference was included in the resulting packfile. This + can be useful to send new tags to native git clients. + --window=[N], --depth=[N]:: These two options affect how the objects contained in the pack are stored using delta compression. The diff --git a/git-rev-parse.html b/git-rev-parse.html index 54cad8557..9e07b1936 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -770,7 +770,7 @@ The lines after the separator describe the options.

Each line of options has this format:

-
<opt_spec><arg_spec>? SP+ help LF
+
<opt_spec><flags>* SP+ help LF
@@ -785,14 +785,36 @@ The lines after the separator describe the options.

-<arg_spec> +<flags>

- an <arg_spec> tells the option parser if the option has an argument - (=), an optional one (? though its use is discouraged) or none - (no <arg_spec> in that case). + <flags> are of *, =, ? or !.

+
    +
  • +

    +Use = if the option takes an argument. +

    +
    • +
  • +

    +Use ? to mean that the option is optional (though its use is discouraged). +

    +
    • +
  • +

    +Use * to mean that this option should not be listed in the usage + generated for the -h argument. It's shown for --help-all as + documented in gitcli(5). +

    +
    • +
  • +

    +Use ! to not make the corresponding negated long option available. +

    +
    • +

The remainder of the line, after stripping the spaces, is used @@ -834,7 +856,7 @@ Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.or

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index f02f6bbb4..6513c2efe 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -325,7 +325,7 @@ The lines after the separator describe the options. Each line of options has this format: ------------ -? SP+ help LF +* SP+ help LF ------------ ``:: @@ -334,10 +334,17 @@ Each line of options has this format: is necessary. `h,help`, `dry-run` and `f` are all three correct ``. -``:: - an `` tells the option parser if the option has an argument - (`=`), an optional one (`?` though its use is discouraged) or none - (no `` in that case). +``:: + `` are of `*`, `=`, `?` or `!`. + * Use `=` if the option takes an argument. + + * Use `?` to mean that the option is optional (though its use is discouraged). + + * Use `*` to mean that this option should not be listed in the usage + generated for the `-h` argument. It's shown for `--help-all` as + documented in linkgit:gitcli[5]. + + * Use `!` to not make the corresponding negated long option available. The remainder of the line, after stripping the spaces, is used as the help associated to the option. diff --git a/git-submodule.html b/git-submodule.html index 71f70853a..b00e5ddfe 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -286,8 +286,9 @@ add

Add the given repository as a submodule at the given path - to the changeset to be committed next. In particular, the - repository is cloned at the specified path, added to the + to the changeset to be committed next. If path is a valid + repository within the project, it is added as is. Otherwise, + repository is cloned at the specified path. path is added to the changeset and registered in .gitmodules. If no path is specified, the path is deduced from the repository specification. If the repository url begins with ./ or ../, it is stored as @@ -390,7 +391,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index e818e6e78..b4d01605a 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -18,8 +18,9 @@ COMMANDS -------- add:: Add the given repository as a submodule at the given path - to the changeset to be committed next. In particular, the - repository is cloned at the specified path, added to the + to the changeset to be committed next. If path is a valid + repository within the project, it is added as is. Otherwise, + repository is cloned at the specified path. path is added to the changeset and registered in .gitmodules. If no path is specified, the path is deduced from the repository specification. If the repository url begins with ./ or ../, it is stored as diff --git a/git.html b/git.html index 749fe9244..d45022540 100644 --- a/git.html +++ b/git.html @@ -1946,7 +1946,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 741ae0e4c..3ed24d449 100644 --- a/git.txt +++ b/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.5.4.3/git.html[documentation for release 1.5.4.3] +* link:v1.5.4.4/git.html[documentation for release 1.5.4.4] * release notes for + link:RelNotes-1.5.4.4.txt[1.5.4.4], link:RelNotes-1.5.4.3.txt[1.5.4.3], link:RelNotes-1.5.4.2.txt[1.5.4.2], link:RelNotes-1.5.4.1.txt[1.5.4.1], -- 2.26.2