diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-01 02:09:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-01 02:09:09 -0700 |
| commit | 34c6dbdef439f7cd93d3fe22493a3c1496ce96f7 (patch) | |
| tree | 650330238dfac230c3c44a8eddaa77c9f09da988 /Documentation | |
| parent | 326df26d3349ee2f4d63b737ba318d6e6fafccd9 (diff) | |
| parent | 5946d4ba8970f00bb62b2c9e8714264831034043 (diff) | |
| download | git-34c6dbdef439f7cd93d3fe22493a3c1496ce96f7.tar.gz git-34c6dbdef439f7cd93d3fe22493a3c1496ce96f7.tar.xz | |
Merge branch 'maint'
* maint:
Whip post 1.5.3.3 maintenance series into shape.
git stash: document apply's --index switch
post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.5.3.3.txt | 6 | ||||
| -rw-r--r-- | Documentation/RelNotes-1.5.3.4.txt | 28 | ||||
| -rw-r--r-- | Documentation/git-stash.txt | 7 |
3 files changed, 34 insertions, 7 deletions
diff --git a/Documentation/RelNotes-1.5.3.3.txt b/Documentation/RelNotes-1.5.3.3.txt index e91bd8416..2a7bfdd5c 100644 --- a/Documentation/RelNotes-1.5.3.3.txt +++ b/Documentation/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/Documentation/RelNotes-1.5.3.4.txt b/Documentation/RelNotes-1.5.3.4.txt new file mode 100644 index 000000000..47ba2870a --- /dev/null +++ b/Documentation/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/Documentation/git-stash.txt b/Documentation/git-stash.txt index 05f40cff6..5723bb06f 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -63,7 +63,7 @@ show [<stash>]:: 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 [<stash>]:: +apply [--index] [<stash>]:: Restore the changes recorded in the stash on top of the current working tree state. When no `<stash>` is given, applies the latest @@ -71,6 +71,11 @@ 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:: Remove all the stashed states. Note that those states will then |