Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
d82829b6
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d82829b6
编写于
4月 02, 2012
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Sync with 1.7.9.6
上级
02f419ef
cb2ed324
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
6 deletion
+17
-6
Documentation/RelNotes/1.7.9.6.txt
Documentation/RelNotes/1.7.9.6.txt
+12
-0
Documentation/git.txt
Documentation/git.txt
+4
-2
builtin/merge.c
builtin/merge.c
+1
-4
未找到文件。
Documentation/RelNotes/1.7.9.6.txt
0 → 100644
浏览文件 @
d82829b6
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.
Documentation/git.txt
浏览文件 @
d82829b6
...
...
@@ -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],
...
...
builtin/merge.c
浏览文件 @
d82829b6
...
...
@@ -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
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录