From a199a7c9d07fa883fa219775c0e6069aeb84cdf3 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 4 Jul 2016 02:05:24 -0400 Subject: [PATCH 1/2] mailmap: use main email address for dturner Signed-off-by: David Turner Signed-off-by: Junio C Hamano --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index a9162c0095..a714e69a11 100644 --- a/.mailmap +++ b/.mailmap @@ -46,6 +46,7 @@ David D. Kilzer David Kågedal David Reiss David S. Miller +David Turner Deskin Miller Dirk Süsserott Eric Blake From 674d38f55b6d6b9f1cea8821f09670e07c1c7961 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 6 Jul 2016 13:08:02 -0700 Subject: [PATCH 2/2] More fixes for 2.9.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.9.1.txt | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/Documentation/RelNotes/2.9.1.txt b/Documentation/RelNotes/2.9.1.txt index ed2bca038b..369383b33d 100644 --- a/Documentation/RelNotes/2.9.1.txt +++ b/Documentation/RelNotes/2.9.1.txt @@ -24,5 +24,39 @@ Fixes since v2.9 file when a change added an entire function at the end of the file, which has been fixed. + * The documentation set has been updated so that literal commands, + configuration variables and environment variables are consistently + typeset in fixed-width font and bold in manpages. + + * "git svn propset" subcommand that was added in 2.3 days is + documented now. + + * The documentation tries to consistently spell "GPG"; when + referring to the specific program name, "gpg" is used. + + * "git reflog" stopped upon seeing an entry that denotes a branch + creation event (aka "unborn"), which made it appear as if the + reflog was truncated. + + * The git-prompt scriptlet (in contrib/) was not friendly with those + who uses "set -u", which has been fixed. + + * A codepath that used alloca(3) to place an unbounded amount of data + on the stack has been updated to avoid doing so. + + * "git update-index --add --chmod=+x file" may be usable as an escape + hatch, but not a friendly thing to force for people who do need to + use it regularly. "git add --chmod=+x file" can be used instead. + + * Build improvements for gnome-keyring (in contrib/) + + * "git status" used to say "working directory" when it meant "working + tree". + + * Comments about misbehaving FreeBSD shells have been clarified with + the version number (9.x and before are broken, newer ones are OK). + + * "git cherry-pick A" worked on an unborn branch, but "git + cherry-pick A..B" didn't. Also contains minor documentation updates and code clean-ups.