From: Junio C Hamano Date: Mon, 1 Oct 2007 16:23:18 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.3-131-g34c6d X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58992c945be1eab6cb6bc22216c90de22b30341f;p=git.git Autogenerated HTML docs for v1.5.3.3-131-g34c6d --- diff --git a/RelNotes-1.5.3.3.txt b/RelNotes-1.5.3.3.txt index e91bd8416..2a7bfdd5c 100644 --- a/RelNotes-1.5.3.3.txt +++ b/RelNotes-1.5.3.3.txt @@ -29,9 +29,3 @@ Fixes since v1.5.3.2 * git-log sometimes invoked underlying "diff" machinery unnecessarily. - --- -exec >/var/tmp/1 -O=v1.5.3.2-29-gb7bb760 -echo O=`git describe refs/heads/maint` -git shortlog --no-merges $O..refs/heads/maint diff --git a/RelNotes-1.5.3.4.txt b/RelNotes-1.5.3.4.txt new file mode 100644 index 000000000..47ba2870a --- /dev/null +++ b/RelNotes-1.5.3.4.txt @@ -0,0 +1,28 @@ +GIT v1.5.3.4 Release Notes +========================== + +Fixes since v1.5.3.3 +-------------------- + + * Sample 'post-receive-hook' incorrectly sent out push + notification e-mails marked as "From: " the committer of the + commit that happened to be at the tip of the branch that was + pushed, not from the person who pushed. + + * git-remote did not exit non-zero status upon error. + + * "git-add -i" did not respond very well to EOF from tty nor + bogus input. + + * "git rebase -i" squash subcommand incorrectly made the + author of later commit the author of resulting commit, + instead of taking from the first one in the squashed series. + + * "git stash apply --index" was not documented. + + +-- +exec >/var/tmp/1 +O=v1.5.3.3-6-g0bdcac5 +echo O=`git describe refs/heads/maint` +git shortlog --no-merges $O..refs/heads/maint diff --git a/git-stash.html b/git-stash.html index ec8f78fcc..7c27cc909 100644 --- a/git-stash.html +++ b/git-stash.html @@ -338,7 +338,7 @@ show [<stash>]

-apply [<stash>] +apply [--index] [<stash>]

@@ -348,6 +348,10 @@ apply [<stash>]

This operation can fail with conflicts; you need to resolve them by hand in the working tree.

+

If the --index option is used, then tries to reinstate not only the working +tree's changes, but also the index's ones. However, this can fail, when you +have conflicts (which are stored in the index, where you therefore can no +longer apply the changes as they were originally).

clear @@ -456,7 +460,7 @@ $ git stash apply diff --git a/git-stash.txt b/git-stash.txt index 05f40cff6..5723bb06f 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -63,7 +63,7 @@ show []:: it will accept any format known to `git-diff` (e.g., `git-stash show -p stash@\{1}` to view the second most recent stash in patch form). -apply []:: +apply [--index] []:: Restore the changes recorded in the stash on top of the current working tree state. When no `` is given, applies the latest @@ -71,6 +71,11 @@ apply []:: + This operation can fail with conflicts; you need to resolve them by hand in the working tree. ++ +If the `--index` option is used, then tries to reinstate not only the working +tree's changes, but also the index's ones. However, this can fail, when you +have conflicts (which are stored in the index, where you therefore can no +longer apply the changes as they were originally). clear:: Remove all the stashed states. Note that those states will then diff --git a/git.html b/git.html index daeb59d4a..1a0faebd6 100644 --- a/git.html +++ b/git.html @@ -1957,7 +1957,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index cb59639f7..abce801e4 100644 --- a/git.txt +++ b/git.txt @@ -46,6 +46,7 @@ Documentation for older releases are available here: * link:v1.5.3/git.html[documentation for release 1.5.3] * release notes for + link:RelNotes-1.5.3.3.txt[1.5.3.3], link:RelNotes-1.5.3.2.txt[1.5.3.2], link:RelNotes-1.5.3.1.txt[1.5.3.1].