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

5
builtin/merge.c
View File

@ -1325,11 +1325,8 @@ 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)