diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-02 13:09:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-02 13:11:49 -0700 |
| commit | d82829b6128263951569221ca0c00dd143da055c (patch) | |
| tree | 3d24c2c1be3a76cc7574cd5f65732cd3ac9c3450 /Documentation/RelNotes | |
| parent | 02f419efcbda05f9923306ae1fcdd754187563fa (diff) | |
| parent | cb2ed324fc917db0b79d7b1f3756575ffa5f70d5 (diff) | |
| download | git-d82829b6128263951569221ca0c00dd143da055c.tar.gz git-d82829b6128263951569221ca0c00dd143da055c.tar.xz | |
Sync with 1.7.9.6
Diffstat (limited to 'Documentation/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/1.7.9.6.txt | 12 |
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 000000000..74bf8825e --- /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. |