undef/git-commit-vandalism
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
commit d82829b612
3 changed files with 17 additions and 6 deletions
Show Stats 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.

6
Documentation/git.txt
View File

@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.7.9.5/git.html[documentation for release 1.7.9.5]
* link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
* release notes for
link:RelNotes/1.7.9.6.txt[1.7.9.6],
link:RelNotes/1.7.9.5.txt[1.7.9.5],
link:RelNotes/1.7.9.4.txt[1.7.9.4],
link:RelNotes/1.7.9.3.txt[1.7.9.3],
@ -54,9 +55,10 @@ Documentation for older releases are available here:
link:RelNotes/1.7.9.1.txt[1.7.9.1],
link:RelNotes/1.7.9.txt[1.7.9].
* link:v1.7.8.4/git.html[documentation for release 1.7.8.4]
* link:v1.7.8.5/git.html[documentation for release 1.7.8.5]
* release notes for
link:RelNotes/1.7.8.5.txt[1.7.8.5],
link:RelNotes/1.7.8.4.txt[1.7.8.4],
link:RelNotes/1.7.8.3.txt[1.7.8.3],
link:RelNotes/1.7.8.2.txt[1.7.8.2],

5
builtin/merge.c
View File

@ -1325,12 +1325,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (!fast_forward_only &&
merge_remote_util(commit) &&
merge_remote_util(commit)->obj &&
merge_remote_util(commit)->obj->type == OBJ_TAG) {
if (option_edit < 0)
option_edit = 1;
merge_remote_util(commit)->obj->type == OBJ_TAG)
allow_fast_forward = 0;
}
}
if (option_edit < 0)
option_edit = default_edit_option();