mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.7.9.6

Browse Source
This commit is contained in:
Junio C Hamano
2012-04-02 13:09:21 -07:00
parent 02f419efcb cb2ed324fc
commit d82829b612
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/RelNotes/1.7.9.6.txt Normal file
View File

@ -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.