From: Junio C Hamano Date: Tue, 1 May 2007 03:05:55 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-rc1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b63afffe7defea8a86848a96bea694e7fa0dc0cd;p=git.git Autogenerated HTML docs for v1.5.2-rc1 --- diff --git a/RelNotes-1.5.1.3.txt b/RelNotes-1.5.1.3.txt index 9a4b069cc..2ddeabd02 100644 --- a/RelNotes-1.5.1.3.txt +++ b/RelNotes-1.5.1.3.txt @@ -1,4 +1,4 @@ -GIT v1.5.1.3 Release Notes (draft) +GIT v1.5.1.3 Release Notes ========================== Fixes since v1.5.1.2 @@ -19,6 +19,8 @@ Fixes since v1.5.1.2 - git-svn inconsistently stripped away username from the URL only when svnsync_props was in use. + - git-svn got confused when handling symlinks on Mac OS. + - git-send-email was not quoting recipient names that have period '.' in them. Also it did not allow overriding envelope sender, which made it impossible to send patches to @@ -31,8 +33,14 @@ Fixes since v1.5.1.2 packfiles incorrectly closed the fd that was still being used to read the pack. ---- -exec >/var/tmp/1 -O=v1.5.1.2-23-gbf7af11 -echo O=`git describe refs/heads/maint` -git shortlog --no-merges $O..refs/heads/maint + - import-tars contributed front-end for fastimport was passing + wrong directory modes without checking. + + - git-fastimport trusted its input too much and allowed to + create corrupt tree objects with entries without a name. + + - git-fetch needlessly barfed when too long reflog action + description was given by the caller. + +Also contains various documentation updates. + diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt index abecac6de..712ebb0b7 100644 --- a/RelNotes-1.5.2.txt +++ b/RelNotes-1.5.2.txt @@ -26,8 +26,14 @@ Updates since v1.5.1 considered a binary or text (the former would be treated by 'git diff' not to produce textual output; the latter can go through the line endings conversion process in repositories - with core.autocrlf set), and specify a custom 3-way merge - driver. + with core.autocrlf set), expand and unexpand '$ident$' keyword + with blob object name, specify a custom 3-way merge driver, + and specify a custom diff driver. You can also apply + arbitrary filter to contents on check-in/check-out codepath + but this feature is an extremely sharp-edged razor and needs + to be handled with caution (do not use it unless you + understand the earlier mailing list discussion on keyward + expansion). * The packfile format now optionally suports 64-bit index. @@ -53,8 +59,21 @@ Updates since v1.5.1 commit -a" (i.e. update the index to match the working tree); it obviously does not make a commit. + - "git clean" honors a new configuration, "clean.requireforce". When + set to true, this makes "git clean" a no-op, preventing you + from losing files by typing "git clean" when you meant to + say "make clean". You can still say "git clean -f" to + override this. + + - "git log" family of commands learned --date={local,relative,default} + option. --date=relative is synonym to the --relative-date. + --date=local gives the timestamp in local timezone. + * Updated behavior of existing commands. + - When $GIT_COMMITTER_EMAIL or $GIT_AUTHOR_EMAIL is not set + but $EMAIL is set, the latter is used as a substitute. + - "git diff --stat" shows size of preimage and postimage blobs for binary contents. Earlier it only said "Bin". @@ -82,11 +101,17 @@ Updates since v1.5.1 - "gitview" (in contrib/ section) learned to better support "git-annotate". + - "git diff $commit1:$path2 $commit2:$path2" can now report + mode changes between the two blobs. + - Local "git fetch" from a repository whose object store is one of the alternates (e.g. fetching from the origin in a repository created with "git clone -l -s") avoids downloading objects unnecessary. + - "git blame" uses .mailmap to canonicalize the author name + just like "git shortlog" does. + * Builds - git-p4import has never been installed; now there is an @@ -102,11 +127,15 @@ Updates since v1.5.1 * Performance Tweaks - - optimized "git-rev-list --bisect" (hence "git-bisect"). + - Optimized "git-rev-list --bisect" (hence "git-bisect"). - - optimized "git-add $path" in a large directory, most of + - Optimized "git-add $path" in a large directory, most of whose contents are ignored. + - The recursive merge strategy updated a worktree file that + was changed identically in two branches, when one of them + renamed it. We do not do that when there is no rename, so + match that behaviour. Fixes since v1.5.1 ------------------ @@ -133,12 +162,15 @@ this release, unless otherwise noted. will not be backported to 1.5.1.x series, as it is rather an intrusive change. + - git-fetch had trouble with a remote with insanely large number + of refs. + * Documentation updates * Performance Tweaks -- exec >/var/tmp/1 -O=v1.5.1.2-242-g2d76548 +O=v1.5.2-rc0-106-g07c785d echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-send-email.html b/git-send-email.html index b5f1b145c..4d364aaf5 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -371,8 +371,9 @@ enabled interface to provide the necessary information.

- If set, specifies the outgoing SMTP server to use. A full - pathname of a sendmail-like program can be specified instead; + If set, specifies the outgoing SMTP server to use (e.g. + smtp.example.com or a raw IP address). Alternatively it can + specify a full pathname of a sendmail-like program instead; the program must support the -i option. Default value can be specified by the sendemail.smtpserver configuration option; the built-in default is /usr/sbin/sendmail or @@ -495,7 +496,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 795db873f..7ae39fd5a 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -54,7 +54,7 @@ The --cc option must be repeated for each user you want on the cc list. --in-reply-to:: Specify the contents of the first In-Reply-To header. - Subsequent emails will refer to the previous email + Subsequent emails will refer to the previous email instead of this if --chain-reply-to is set (the default) Only necessary if --compose is also set. If --compose is not set, this will be prompted for. @@ -68,8 +68,9 @@ The --cc option must be repeated for each user you want on the cc list. all that is output. --smtp-server:: - If set, specifies the outgoing SMTP server to use. A full - pathname of a sendmail-like program can be specified instead; + If set, specifies the outgoing SMTP server to use (e.g. + `smtp.example.com` or a raw IP address). Alternatively it can + specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the 'sendemail.smtpserver' configuration option; the built-in default is `/usr/sbin/sendmail` or diff --git a/git-svn.html b/git-svn.html index 7dc20e8c6..8f0acbeab 100644 --- a/git-svn.html +++ b/git-svn.html @@ -545,8 +545,9 @@ and have no uncommitted changes.

When given an SVN revision number of the form rN, returns the - corresponding git commit hash. When given a tree-ish, returns the - corresponding SVN revision number. + corresponding git commit hash (this can optionally be followed by a + tree-ish to specify which branch should be searched). When given a + tree-ish, returns the corresponding SVN revision number.

@@ -994,7 +995,7 @@ should be manually entered with a text-editor or using diff --git a/git-svn.txt b/git-svn.txt index a35b9de3b..62d7ef8be 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -161,8 +161,9 @@ Any other arguments are passed directly to `git log' -- 'find-rev':: When given an SVN revision number of the form 'rN', returns the - corresponding git commit hash. When given a tree-ish, returns the - corresponding SVN revision number. + corresponding git commit hash (this can optionally be followed by a + tree-ish to specify which branch should be searched). When given a + tree-ish, returns the corresponding SVN revision number. 'set-tree':: You should consider using 'dcommit' instead of this command. diff --git a/git.html b/git.html index 38bb715b9..382b27e52 100644 --- a/git.html +++ b/git.html @@ -290,6 +290,9 @@ progress, but when finished hopefully it will guide a new user in a coherent way to git enlightenment ;-).

The COMMAND is either a name of a Git command (see below) or an alias as defined in the configuration file (see git-config(1)).

+

Formatted and hyperlinked version of the latest git +documentation can be viewed at +http://www.kernel.org/pub/software/scm/git/docs/.

OPTIONS

@@ -2331,7 +2334,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index c5d02dacd..b0550b8b1 100644 --- a/git.txt +++ b/git.txt @@ -29,6 +29,10 @@ in a coherent way to git enlightenment ;-). The COMMAND is either a name of a Git command (see below) or an alias as defined in the configuration file (see gitlink:git-config[1]). +Formatted and hyperlinked version of the latest git +documentation can be viewed at +`http://www.kernel.org/pub/software/scm/git/docs/`. + ifdef::stalenotes[] [NOTE] ============