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 | |
| parent | 02f419efcbda05f9923306ae1fcdd754187563fa (diff) | |
| parent | cb2ed324fc917db0b79d7b1f3756575ffa5f70d5 (diff) | |
| download | git-d82829b6128263951569221ca0c00dd143da055c.zip git-d82829b6128263951569221ca0c00dd143da055c.tar.gz git-d82829b6128263951569221ca0c00dd143da055c.tar.bz2 | |
Sync with 1.7.9.6
| -rw-r--r-- | Documentation/RelNotes/1.7.9.6.txt | 12 | ||||
| -rw-r--r-- | Documentation/git.txt | 6 | ||||
| -rw-r--r-- | builtin/merge.c | 5 |
3 files changed, 17 insertions, 6 deletions
diff --git a/Documentation/RelNotes/1.7.9.6.txt b/Documentation/RelNotes/1.7.9.6.txt new file mode 100644 index 0000000..74bf882 --- /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. diff --git a/Documentation/git.txt b/Documentation/git.txt index 7ccb55d..ae34e8a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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], 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) |