From 17dde0e423f4710264b28df4670ce94847970f64 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 26 Feb 2007 09:50:21 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0.2-204-gc260 --- RelNotes-1.5.0.2.txt | 28 +++++++++++++++++----------- config.txt | 4 ++++ git-config.html | 11 ++++++++++- git-remote.html | 12 +++++++++++- git-remote.txt | 13 +++++++++++++ git.html | 2 +- git.txt | 4 +++- 7 files changed, 59 insertions(+), 15 deletions(-) diff --git a/RelNotes-1.5.0.2.txt b/RelNotes-1.5.0.2.txt index 4dc134485..b061e50ff 100644 --- a/RelNotes-1.5.0.2.txt +++ b/RelNotes-1.5.0.2.txt @@ -6,6 +6,14 @@ Fixes since v1.5.0.1 * Bugfixes + - Automated merge conflict handling when changes to symbolic + links conflicted were completely broken. The merge-resolve + strategy created a regular file with conflict markers in it + in place of the symbolic link. The default strategy, + merge-recursive was even more broken. It removed the path + that was pointed at by the symbolic link. Both of these + problems have been fixed. + - 'git diff maint master next' did not correctly give combined diff across three trees. @@ -39,21 +47,19 @@ Fixes since v1.5.0.1 impossible to repack after accumulating many (small) packs in the repository. + - 'git-diff' to review the combined diff during a conflicted + merge were not reading the working tree version correctly + when changes to a symbolic link conflicted. It should have + read the data using readlink(2) but read from the regular + file the symbolic link pointed at. + + - 'git-remote' did not like period in a remote's name. + * Documentation updates - added and clarified core.bare, core.legacyheaders configurations. - updated "git-clone --depth" documentation. -* Assorted git-gui fixes. - --- -exec >/var/tmp/1 -O=v1.5.0.1-35-gffa84ff -echo O=`git describe maint` -git shortlog --no-merges $O..maint - -#Local Variables: -#mode: text -#End: +* Assorted git-gui fixes. diff --git a/config.txt b/config.txt index 6309d89b4..d2b4a05ca 100644 --- a/config.txt +++ b/config.txt @@ -483,6 +483,10 @@ remote..uploadpack:: The default program to execute on the remote side when fetching. See option \--exec of gitlink:git-fetch-pack[1]. +remote..tagopt:: + Setting this value to --no-tags disables automatic tag following when fetching + from remote + remotes.:: The list of remotes which are fetched by "git remote update ". See gitlink:git-remote[1]. diff --git a/git-config.html b/git-config.html index a92807766..0ad4eabdc 100644 --- a/git-config.html +++ b/git-config.html @@ -1309,6 +1309,15 @@ remote.<name>.uploadpack

+remote.<name>.tagopt +
+
+

+ Setting this value to --no-tags disables automatic tag following when fetching + from remote <name> +

+
+
remotes.<group>
@@ -1460,7 +1469,7 @@ transfer.unpackLimit diff --git a/git-remote.html b/git-remote.html index e7a8a730e..ae6be1373 100644 --- a/git-remote.html +++ b/git-remote.html @@ -297,6 +297,16 @@ Adds a remote named <name> for the repository at <url>. The command git fetch <name> can then be used to create and update remote-tracking branches <name>/<branch>.

+

With -f option, git fetch <name> is run immediately after +the remote information is set up.

+

With -t <branch> option, instead of the default glob +refspec for the remote to track all branches under +$GIT_DIR/remotes/<name>/, a refspec to track only <branch> +is created. You can give more than one -t <branch> to track +multiple branche without grabbing all branches.

+

With -m <master> option, $GIT_DIR/remotes/<name>/HEAD is set +up to point at remote's <master> branch instead of whatever +branch the HEAD at the remote repository actually points at.

show @@ -381,7 +391,7 @@ $ git checkout -b nfs linux-nfs/master diff --git a/git-remote.txt b/git-remote.txt index 250761f97..266faade3 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -32,6 +32,19 @@ subcommands are available to perform operations on the remotes. Adds a remote named for the repository at . The command `git fetch ` can then be used to create and update remote-tracking branches /. ++ +With `-f` option, `git fetch ` is run immediately after +the remote information is set up. ++ +With `-t ` option, instead of the default glob +refspec for the remote to track all branches under +`$GIT_DIR/remotes//`, a refspec to track only `` +is created. You can give more than one `-t ` to track +multiple branche without grabbing all branches. ++ +With `-m ` option, `$GIT_DIR/remotes//HEAD` is set +up to point at remote's `` branch instead of whatever +branch the `HEAD` at the remote repository actually points at. 'show':: diff --git a/git.html b/git.html index 3e453694f..6bb8b417e 100644 --- a/git.html +++ b/git.html @@ -2290,7 +2290,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index aa3acc046..9a7474798 100644 --- a/git.txt +++ b/git.txt @@ -35,7 +35,9 @@ ifdef::stalenotes[] You are reading the documentation for the latest version of git. Documentation for older releases are available here: -* link:v1.5.0.1/git.html[documentation for release 1.5.0.1] +* link:v1.5.0.2/git.html[documentation for release 1.5.0.2] + +* link:v1.5.0.2/RelNotes-1.5.0.2.txt[release notes for 1.5.0.2] * link:v1.5.0.1/RelNotes-1.5.0.1.txt[release notes for 1.5.0.1] -- 2.26.2