From: Junio C Hamano Date: Wed, 25 Jul 2007 08:53:33 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3770f9d55168c4d4ab437414e20475790e02e3a;p=git.git Autogenerated HTML docs for v1.5.3-rc3 --- diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt index 896ff1d95..785bd3845 100644 --- a/RelNotes-1.5.3.txt +++ b/RelNotes-1.5.3.txt @@ -32,8 +32,9 @@ Updates since v1.5.2 - "git rebase" learned an "interactive" mode that let you pick and reorder which commits to rebuild. - - "git fsck" can save its findings in $GIT_DIR/lost-found, - without a separate invocation of "git lost-found" command. + - "git fsck" can save its findings in $GIT_DIR/lost-found, without a + separate invocation of "git lost-found" command. The blobs stored by + lost-found are stored in plain format to allow you to grep in them. - $GIT_WORK_TREE environment variable can be used together with $GIT_DIR to work in a subdirectory of a working tree that is @@ -49,6 +50,10 @@ Updates since v1.5.2 - "git-cvsserver" learned new options (--base-path, --export-all, --strict-paths) inspired by git-daemon. + - "git-commit" can use "-t templatefile" option and commit.template + configuration variable to prime the commit message given to you in the + editor. + - "git-submodule" command helps you manage the projects from the superproject that contain them. @@ -105,9 +110,30 @@ Updates since v1.5.2 * Updated behavior of existing commands. + - "gitweb" can offer multiple snapshot formats. + + ***NOTE*** Unfortunately, this changes the format of the + $feature{snapshot}{default} entry in the per-site + configuration file 'gitweb_config.perl'. It used to be a + three-element tuple that describe a single format; with the + new configuration item format, you only have to say the name + of the format ('tgz', 'tbz2' or 'zip'). Please update the + your configuration file accordingly. + + - The editor to use with many interactive commands can be + overridden with GIT_EDITOR environment variable, or if it + does not exist, with core.editor configuration variable. As + before, if you have neither, environment variables VISUAL + and EDITOR are consulted in this order, and then finally we + fall back on "vi". + - "git rm --cached" does not complain when removing a newly added file from the index anymore. + - Options to "git log" to affect how --grep/--author options look for + given strings now have shorter abbreviations. -i is for ignore case, + and -E is for extended regexp. + - "git svn dcommit" retains local merge information. - "git config" to set values also honors type flags like --bool @@ -189,6 +215,10 @@ Updates since v1.5.2 git-fast-import (also in contrib). The man page and p4 rpm have been removed as well. + - "git mailinfo" (hence "am") now tries to see if the message + is in utf-8 first, instead of assuming iso-8859-1, if + incoming e-mail does not say what encoding it is in. + * Builds - old-style function definitions (most notably, a function @@ -232,6 +262,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3-rc2 +O=v1.5.3-rc3 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-commit.html b/git-commit.html index f528785bc..af283396a 100644 --- a/git-commit.html +++ b/git-commit.html @@ -380,6 +380,19 @@ that, you can recover from it with git-reset(1).

+-t <file>|--template=<file> +
+
+

+ Use the contents of the given file as the initial version + of the commit message. The editor is invoked and you can + make subsequent changes. If a message is specified using + the -m or -F options, this option has no effect. The + template file may also be specified using the commit.template + configuration variable. +

+
+
-s|--signoff
@@ -689,7 +702,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 8e0e7e2d0..3f36c6782 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -74,6 +74,14 @@ OPTIONS -m |--message=:: Use the given as the commit message. +-t |--template=:: + Use the contents of the given file as the initial version + of the commit message. The editor is invoked and you can + make subsequent changes. If a message is specified using + the `-m` or `-F` options, this option has no effect. The + template file may also be specified using the `commit.template` + configuration variable. + -s|--signoff:: Add Signed-off-by line at the end of the commit message. diff --git a/git-diff-tree.html b/git-diff-tree.html index 89ca5b1a7..bd505f816 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -775,10 +775,10 @@ separated with a single space are given.

- Pretty print the contents of the commit logs in a given format, + Pretty-print the contents of the commit logs in a given format, where <format> can be one of oneline, short, medium, full, fuller, email, raw and format:<string>. - When left out the format default to medium. + When omitted, the format defaults to medium.

@@ -1564,7 +1564,7 @@ two unresolved merge parents with the working tree file diff --git a/git-log.html b/git-log.html index 3e7996d83..c81a65520 100644 --- a/git-log.html +++ b/git-log.html @@ -291,10 +291,10 @@ each commit introduces are shown.

- Pretty print the contents of the commit logs in a given format, + Pretty-print the contents of the commit logs in a given format, where <format> can be one of oneline, short, medium, full, fuller, email, raw and format:<string>. - When left out the format default to medium. + When omitted, the format defaults to medium.

@@ -840,7 +840,7 @@ reversible operation.

diff --git a/git-rev-list.html b/git-rev-list.html index d49e2b6a6..e8c44d138 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -352,10 +352,10 @@ more specialized family of commit log tools: git-log(1)

- Pretty print the contents of the commit logs in a given format, + Pretty-print the contents of the commit logs in a given format, where <format> can be one of oneline, short, medium, full, fuller, email, raw and format:<string>. - When left out the format default to medium. + When omitted, the format defaults to medium.

@@ -1142,7 +1142,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-show.html b/git-show.html index 7cb235b0a..a8dcc1b35 100644 --- a/git-show.html +++ b/git-show.html @@ -306,10 +306,10 @@ control how the changes the commit introduces are shown.

- Pretty print the contents of the commit logs in a given format, + Pretty-print the contents of the commit logs in a given format, where <format> can be one of oneline, short, medium, full, fuller, email, raw and format:<string>. - When left out the format default to medium. + When omitted, the format defaults to medium.

@@ -762,7 +762,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

diff --git a/pretty-options.txt b/pretty-options.txt index 746bc5b7f..973d8dd73 100644 --- a/pretty-options.txt +++ b/pretty-options.txt @@ -1,9 +1,9 @@ --pretty[='']:: - Pretty print the contents of the commit logs in a given format, + Pretty-print the contents of the commit logs in a given format, where '' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw' and 'format:'. - When left out the format default to 'medium'. + When omitted, the format defaults to 'medium'. --abbrev-commit:: Instead of showing the full 40-byte hexadecimal commit object