about summary refs log tree commit diff
path: root/third_party/git/Documentation/RelNotes/1.7.9.6.txt
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/Documentation/RelNotes/1.7.9.6.txt')
-rw-r--r--third_party/git/Documentation/RelNotes/1.7.9.6.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/third_party/git/Documentation/RelNotes/1.7.9.6.txt b/third_party/git/Documentation/RelNotes/1.7.9.6.txt
new file mode 100644
index 000000000000..74bf8825e2be
--- /dev/null
+++ b/third_party/git/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.