diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-02 20:09:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-02 20:11:49 (GMT) |
| commit | d82829b6128263951569221ca0c00dd143da055c (patch) | |
| tree | 3d24c2c1be3a76cc7574cd5f65732cd3ac9c3450 /builtin | |
| parent | 02f419efcbda05f9923306ae1fcdd754187563fa (diff) | |
| parent | cb2ed324fc917db0b79d7b1f3756575ffa5f70d5 (diff) | |
| download | git-d82829b6128263951569221ca0c00dd143da055c.zip git-d82829b6128263951569221ca0c00dd143da055c.tar.gz git-d82829b6128263951569221ca0c00dd143da055c.tar.bz2 | |
Sync with 1.7.9.6
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index cb8f149..08e01e8 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -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) |