aboutsummaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-27 15:37:02 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-27 15:37:02 -0800
commit25a7850a106ed0f27b88b8ce0b89fd326120dff4 (patch)
treea9928a82c3a2f58018e80426d3a45d956590ef40 /Documentation/RelNotes
parentff3d656b7ce98bf5c408a1432f88bd6b8ead2d8c (diff)
parentb0fa280751a8a3e7cee093a7fdc3656490abf984 (diff)
downloadgit-25a7850a106ed0f27b88b8ce0b89fd326120dff4.tar.gz
git-25a7850a106ed0f27b88b8ce0b89fd326120dff4.tar.xz
Merge branch 'maint'
* maint: Update draft release notes to 1.7.9.3 CodingGuidelines: do not use 'which' in shell scripts CodingGuidelines: Add a note about spaces after redirection post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly post-receive-email: remove unused variable
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r--Documentation/RelNotes/1.7.9.3.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.9.3.txt b/Documentation/RelNotes/1.7.9.3.txt
index 1d03fd10c..d7be17768 100644
--- a/Documentation/RelNotes/1.7.9.3.txt
+++ b/Documentation/RelNotes/1.7.9.3.txt
@@ -14,4 +14,11 @@ Fixes since v1.7.9.2
* "git add --refresh <pathspec>" used to warn about unmerged paths
outside the given pathspec.
+ * The commit log template given with "git merge --edit" did not have
+ a short instructive text like what "git commit" gives.
+
+ * "gitweb" used to drop warnings in the log file when "heads" view is
+ accessed in a repository whose HEAD does not point at a valid
+ branch.
+
Also contains minor fixes and documentation updates.