summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.7.9.6.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-02 13:07:58 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-02 13:07:58 -0700
commitcb2ed324fc917db0b79d7b1f3756575ffa5f70d5 (patch)
treedaab0be3c734e90a06ff182b0836d990ed750834 /Documentation/RelNotes/1.7.9.6.txt
parentb52ab19d91015ebd6bebc83a82b2c3d64b948b36 (diff)
downloadgit-cb2ed324fc917db0b79d7b1f3756575ffa5f70d5.tar.gz
Git 1.7.9.6v1.7.9.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.7.9.6.txt')
-rw-r--r--Documentation/RelNotes/1.7.9.6.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.9.6.txt b/Documentation/RelNotes/1.7.9.6.txt
new file mode 100644
index 0000000000..74bf8825e2
--- /dev/null
+++ b/Documentation/RelNotes/1.7.9.6.txt
@@ -0,0 +1,12 @@
+Git v1.7.9.6 Release Notes
+==========================
+
+Fixes since v1.7.9.5
+--------------------
+
+ * "git merge $tag" to merge an annotated tag always opens the editor
+ during an interactive edit session. v1.7.10 series introduced an
+ environment variable GIT_MERGE_AUTOEDIT to help older scripts decline
+ this behaviour, but the maintenance track should also support it.
+
+Also contains minor fixes and documentation updates.