From: Junio C Hamano Date: Sat, 5 Jan 2008 10:32:26 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4-rc2-38-gd6da3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14b76487ff861981455b320a2c6d17632997773e;p=git.git Autogenerated HTML docs for v1.5.4-rc2-38-gd6da3 --- diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index e6fbcdb2e..c6953ea51 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -114,6 +114,9 @@ Updates since v1.5.3 * "git reset" is now built-in and its output can be squelched with -q. + * "git reset --hard" does not make any sense in a bare + repository, but did not error out; fixed. + * "git send-email" can optionally talk over ssmtp and use SMTP-AUTH. * "git rebase" learned --whitespace option. @@ -344,6 +347,6 @@ series. -- exec >/var/tmp/1 -O=v1.5.4-rc1-36-g49e6be5 +O=v1.5.4-rc2-37-ge0cd252 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-commit-tree.html b/git-commit-tree.html index cea81645b..3d5adcafb 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -422,7 +422,7 @@ mind.

  • git-commit-tree (hence, git-commit which uses it) issues - an warning if the commit log message given to it does not look + a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in .git/config file, like this: @@ -477,7 +477,7 @@ reversible operation.

    diff --git a/git-commit.html b/git-commit.html index d0a6bbea5..601a162e3 100644 --- a/git-commit.html +++ b/git-commit.html @@ -661,7 +661,7 @@ mind.

  • git-commit-tree (hence, git-commit which uses it) issues - an warning if the commit log message given to it does not look + a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in .git/config file, like this: @@ -730,7 +730,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-log.html b/git-log.html index fc59725ef..1c32e39e9 100644 --- a/git-log.html +++ b/git-log.html @@ -1426,7 +1426,7 @@ mind.

  • git-commit-tree (hence, git-commit which uses it) issues - an warning if the commit log message given to it does not look + a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in .git/config file, like this: @@ -1477,7 +1477,7 @@ reversible operation.

    diff --git a/git-reset.html b/git-reset.html index 368914a72..3be0caf00 100644 --- a/git-reset.html +++ b/git-reset.html @@ -274,7 +274,7 @@ git-reset(1) Manual Page
    git-reset [--mixed | --soft | --hard] [-q] [<commit>] -git-reset [--mixed] [-q] <commit> [--] <paths>…
    +git-reset [--mixed] [-q] [<commit>] [--] <paths>…

    DESCRIPTION

    @@ -335,7 +335,7 @@ the index from a given commit, without moving HEAD.

    - Commit to make the current HEAD. + Commit to make the current HEAD. If not given defaults to HEAD.

    @@ -575,7 +575,7 @@ At this point the index file still has all the WIP changes you
    diff --git a/git-reset.txt b/git-reset.txt index 050e4eadb..69722d14d 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git-reset' [--mixed | --soft | --hard] [-q] [] -'git-reset' [--mixed] [-q] [--] ... +'git-reset' [--mixed] [-q] [] [--] ... DESCRIPTION ----------- @@ -49,7 +49,7 @@ OPTIONS Be quiet, only report errors. :: - Commit to make the current HEAD. + Commit to make the current HEAD. If not given defaults to HEAD. Examples -------- diff --git a/git-show.html b/git-show.html index 1e0834b2d..0c1afc56f 100644 --- a/git-show.html +++ b/git-show.html @@ -708,7 +708,7 @@ mind.

  • git-commit-tree (hence, git-commit which uses it) issues - an warning if the commit log message given to it does not look + a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in .git/config file, like this: @@ -762,7 +762,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/i18n.txt b/i18n.txt index b95f99be6..1e188e6e7 100644 --- a/i18n.txt +++ b/i18n.txt @@ -22,7 +22,7 @@ does not forbid it. However, there are a few things to keep in mind. . `git-commit-tree` (hence, `git-commit` which uses it) issues - an warning if the commit log message given to it does not look + a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in `.git/config` file, like this: