Git 1.7.9.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 2, 2012 at 13:07 UTC
cb2ed324fc917db0b79d7b1f3756575ffa5f70d5
4 files changed
+18
-4
Documentation/RelNotes/1.7.9.6.txt
new
+12
@@ -0,0 +1,12 @@
1
+Git v1.7.9.6 Release Notes
2
+==========================
3
+
4
+Fixes since v1.7.9.5
5
+--------------------
6
+
7
+ * "git merge $tag" to merge an annotated tag always opens the editor
8
+ during an interactive edit session. v1.7.10 series introduced an
9
+ environment variable GIT_MERGE_AUTOEDIT to help older scripts decline
10
+ this behaviour, but the maintenance track should also support it.
11
+
12
+Also contains minor fixes and documentation updates.
Documentation/git.txt
+4
-2
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
44
branch of the `git.git` repository.
45
Documentation for older releases are available here:
46
47
-* link:v1.7.9.5/git.html[documentation for release 1.7.9.5]
47
+* link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
48
49
* release notes for
50
+ link:RelNotes/1.7.9.6.txt[1.7.9.6],
51
link:RelNotes/1.7.9.5.txt[1.7.9.5],
52
link:RelNotes/1.7.9.4.txt[1.7.9.4],
53
link:RelNotes/1.7.9.3.txt[1.7.9.3],
@@ -54,9 +55,10 @@ Documentation for older releases are available here:
55
link:RelNotes/1.7.9.1.txt[1.7.9.1],
56
link:RelNotes/1.7.9.txt[1.7.9].
57
57
-* link:v1.7.8.4/git.html[documentation for release 1.7.8.4]
58
+* link:v1.7.8.5/git.html[documentation for release 1.7.8.5]
59
60
* release notes for
61
+ link:RelNotes/1.7.8.5.txt[1.7.8.5],
62
link:RelNotes/1.7.8.4.txt[1.7.8.4],
63
link:RelNotes/1.7.8.3.txt[1.7.8.3],
64
link:RelNotes/1.7.8.2.txt[1.7.8.2],
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.9.5
4
+DEF_VER=v1.7.9.6
5
6
LF='
7
'
RelNotes
+1
-1
@@ -1 +1 @@
1
-Documentation/RelNotes/1.7.9.5.txt
\ No newline at end of file
1
+Documentation/RelNotes/1.7.9.6.txt
\ No newline at end of file