From f7bb669c0b2263dd46cbcf60527b88293ae0bfd1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 27 Jan 2008 08:23:46 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4-rc5 --- RelNotes-1.5.4.txt | 25 +++++++++++++------------ fetch-options.txt | 12 ++++++++---- git-fetch.html | 9 ++++----- git-pull.html | 29 ++++++++++++++++++----------- git-pull.txt | 7 ++++++- git-send-email.html | 4 +++- git-send-email.txt | 2 ++ git-svn.html | 13 ++++++++----- git-svn.txt | 11 +++++++---- 9 files changed, 69 insertions(+), 43 deletions(-) diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index 9e43ac23a..f968fc495 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -11,7 +11,7 @@ Removal helper script lost all its users and has been removed. -Temporarily Disabled +Temporarily disabled -------------------- * "git http-push" is known not to work well with cURL library older @@ -27,10 +27,10 @@ Temporarily Disabled Deprecation notices ------------------- - * The next feature release of git (this change is scheduled for v1.6.0) - will by default install dashed form of commands (e.g. "git-commit") - outside of users' normal $PATH, and will install only selected - commands ("git" itself, and "gitk") in $PATH. This implies: + * From v1.6.0, git will by default install dashed form of commands + (e.g. "git-commit") outside of users' normal $PATH, and will install + only selected commands ("git" itself, and "gitk") in $PATH. This + implies: - Using dashed forms of git commands (e.g. "git-commit") from the command line has been informally deprecated since early 2006, but @@ -44,8 +44,8 @@ Deprecation notices - Use of dashed forms with "PATH=$(git --exec-path):$PATH; export PATH" early in your script is not deprecated with this change. - Users are strongly encouraged to adjust their habits and scripts now - to prepare for this. + Users are strongly encouraged to adjust their habits and scripts now + to prepare for this change. * The post-receive hook was introduced in March 2007 to supersede the post-update hook, primarily to overcome the command line length @@ -80,7 +80,7 @@ Updates since v1.5.3 * Comes with much improved gitk, with i18n. - * Comes with "git gui" 0.9.1 with i18n. + * Comes with git-gui 0.9.2 with i18n. * gitk is now merged as a subdirectory of git.git project, in preparation for its i18n. @@ -242,8 +242,8 @@ Updates since v1.5.3 from its first parent. * "git commit" used to unconditionally strip comment lines that - began with '#' and removed excess blank lines. This - behaviour has been made configurable. + began with '#' and removed excess blank lines. This behavior has + been made configurable. * "git commit" has been rewritten in C. @@ -327,7 +327,7 @@ Updates since v1.5.3 * "git status" from a subdirectory now shows relative paths, which makes copy-and-pasting for git-checkout/git-add/git-rm easier. The - traditional behaviour to show the full path relative to the top of + traditional behavior to show the full path relative to the top of the work tree can be had by setting status.relativepaths configuration variable to false. @@ -351,6 +351,7 @@ Updates since v1.5.3 - enhancement and more use of the strbuf API. + * Makefile tweaks to support HP-UX is in. Fixes since v1.5.3 ------------------ @@ -377,6 +378,6 @@ series. -- exec >/var/tmp/1 -O=v1.5.4-rc4 +O=v1.5.4-rc5 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/fetch-options.txt b/fetch-options.txt index 61e48ccf0..b67591148 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -23,11 +23,15 @@ fetches is a descendant of ``. This option overrides that check. +ifdef::git-pull[] +\--no-tags:: +endif::git-pull[] +ifndef::git-pull[] -n, \--no-tags:: - By default, `git-fetch` fetches tags that point at - objects that are downloaded from the remote repository - and stores them locally. This option disables this - automatic tag following. +endif::git-pull[] + By default, tags that point at objects that are downloaded + from the remote repository are fetched and stored locally. + This option disables this automatic tag following. -t, \--tags:: Most of the tags are fetched automatically as branch diff --git a/git-fetch.html b/git-fetch.html index 1ec17f23b..5b7174aaa 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -347,10 +347,9 @@ branches you are not interested in, you will not get them.

- By default, git-fetch fetches tags that point at - objects that are downloaded from the remote repository - and stores them locally. This option disables this - automatic tag following. + By default, tags that point at objects that are downloaded + from the remote repository are fetched and stored locally. + This option disables this automatic tag following.

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

diff --git a/git-pull.html b/git-pull.html index f7e08c187..da9aa1981 100644 --- a/git-pull.html +++ b/git-pull.html @@ -375,6 +375,8 @@ when merging local branches into the current branch.

head, git-merge-octopus otherwise).

+ +
-q, --quiet
@@ -426,14 +428,13 @@ when merging local branches into the current branch.

--n, --no-tags +--no-tags

- By default, git-fetch fetches tags that point at - objects that are downloaded from the remote repository - and stores them locally. This option disables this - automatic tag following. + By default, tags that point at objects that are downloaded + from the remote repository are fetched and stored locally. + This option disables this automatic tag following.

@@ -789,12 +790,18 @@ ours

- Instead of a merge, perform a rebase after fetching. - NOTE: This is a potentially _dangerous_ mode of operation. - It rewrites history, which does not bode well when you - published that history already. Do not use this option - unless you have read git-rebase(1) carefully. + Instead of a merge, perform a rebase after fetching. If + there is a remote ref for the upstream branch, and this branch + was rebased since last fetched, the rebase uses that information + to avoid rebasing non-local changes.

+
+
+
*NOTE:* This is a potentially _dangerous_ mode of operation.
+It rewrites history, which does not bode well when you
+published that history already.  Do *not* use this option
+unless you have read linkgit:git-rebase[1] carefully.
+
--no-rebase @@ -966,7 +973,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-pull.txt b/git-pull.txt index 77fdaf146..4cc633a5e 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -25,6 +25,7 @@ OPTIONS ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[] @@ -34,7 +35,11 @@ include::urls-remotes.txt[] include::merge-strategies.txt[] \--rebase:: - Instead of a merge, perform a rebase after fetching. + Instead of a merge, perform a rebase after fetching. If + there is a remote ref for the upstream branch, and this branch + was rebased since last fetched, the rebase uses that information + to avoid rebasing non-local changes. + *NOTE:* This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option diff --git a/git-send-email.html b/git-send-email.html index 6803e9be9..5227151f8 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -495,6 +495,8 @@ enabled interface to provide the necessary information.

Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. + Default is the value of the sendemail.to configuration value; + if that is unspecified, this will be prompted for.

The --to option must be repeated for each user you want on the to list.

@@ -616,7 +618,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 4b8ec8a20..0554f2b37 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -137,6 +137,8 @@ The --cc option must be repeated for each user you want on the cc list. Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. + Default is the value of the 'sendemail.to' configuration value; + if that is unspecified, this will be prompted for. + The --to option must be repeated for each user you want on the to list. diff --git a/git-svn.html b/git-svn.html index cf054d7d2..486ec0a8a 100644 --- a/git-svn.html +++ b/git-svn.html @@ -961,10 +961,13 @@ have each person clone that repository with git clone:

# Do the initial import on a server
         ssh server "cd /pub && git-svn clone http://svn.foo.org/project
-# Clone locally
-        git clone server:/pub/project
-# Tell git-svn which branch contains the Subversion commits
-        git update-ref refs/remotes/git-svn origin/master
+# Clone locally - make sure the refs/remotes/ space matches the server
+        mkdir project
+        cd project
+        git-init
+        git remote add origin server:/pub/project
+        git config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/*
+        git fetch
 # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
         git-svn init http://svn.foo.org/project
 # Pull the latest changes from Subversion
@@ -1071,7 +1074,7 @@ should be manually entered with a text-editor or using
diff --git a/git-svn.txt b/git-svn.txt index e1a1d46a9..b1d527f74 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -456,10 +456,13 @@ have each person clone that repository with 'git clone': ------------------------------------------------------------------------ # Do the initial import on a server ssh server "cd /pub && git-svn clone http://svn.foo.org/project -# Clone locally - git clone server:/pub/project -# Tell git-svn which branch contains the Subversion commits - git update-ref refs/remotes/git-svn origin/master +# Clone locally - make sure the refs/remotes/ space matches the server + mkdir project + cd project + git-init + git remote add origin server:/pub/project + git config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/* + git fetch # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) git-svn init http://svn.foo.org/project # Pull the latest changes from Subversion -- 2.26.2