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

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

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

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

contrib/hooks/post-receive-email

@@ -177,7 +177,6 @@ generate_email_header()
 	# --- Email (all stdout will be the email)
 	# Generate header
 	cat <<-EOF
-	From: $committer
 	To: $recipients
 	Subject: ${EMAILPREFIX}$projectdesc $refname_type, $short_refname, ${change_type}d. $describe
 	X-Git-Refname: $refname