Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
50a991ec
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,发现更多精彩内容 >>
提交
50a991ec
编写于
6月 13, 2009
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'maint-1.6.2' into maint
* maint-1.6.2: git-rerere.txt: grammatical fixups and cleanups
上级
94af7c31
9b7dc718
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
33 deletion
+32
-33
Documentation/git-rerere.txt
Documentation/git-rerere.txt
+32
-33
未找到文件。
Documentation/git-rerere.txt
浏览文件 @
50a991ec
...
...
@@ -12,15 +12,15 @@ SYNOPSIS
DESCRIPTION
-----------
In a workflow
that employs
relatively long lived topic branches,
the developer sometimes needs to resolve the same conflict over
In a workflow
employing
relatively long lived topic branches,
the developer sometimes needs to resolve the same conflict
s
over
and over again until the topic branches are done (either merged
to the "release" branch, or sent out and accepted upstream).
This command
helps this process by recording conflicted
automerge results and corresponding hand-resolve results on the
initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution
.
This command
assists the developer in this process by recording
conflicted automerge results and corresponding hand resolve results
on the initial manual merge, and applying previously recorded
hand resolutions to their corresponding automerge results
.
[NOTE]
You need to set the configuration variable rerere.enabled to
...
...
@@ -54,18 +54,18 @@ for resolutions.
'gc'::
This
command is used to prune records of conflicted merge
that
occurred
long time ago. By default, conflicts older than 15
days that you have not recorded their resolution, and conflicts
older than 60 days, are pruned. These are controlled with
This
prunes records of conflicted merges
that
occurred
a long time ago. By default, unresolved conflicts older
than 15 days and resolved conflicts older than 60
days are pruned. These defaults are controlled via the
`gc.rerereunresolved` and `gc.rerereresolved` configuration
variables.
variables
respectively
.
DISCUSSION
----------
When your topic branch modifies overlapping area that your
When your topic branch modifies
an
overlapping area that your
master branch (or upstream) touched since your topic branch
forked from it, you may want to test it with the latest master,
even before your topic branch is ready to be pushed upstream:
...
...
@@ -140,9 +140,9 @@ top of the tip before the test merge:
This would leave only one merge commit when your topic branch is
finally ready and merged into the master branch. This merge
would require you to resolve the conflict, introduced by the
commits marked with `*`. However,
often this conflict is
the
commits marked with `*`. However,
this conflict is often
the
same conflict you resolved when you created the test merge you
blew away. 'git-rerere'
command helps you to
resolve this final
blew away. 'git-rerere'
helps you
resolve this final
conflicted merge using the information from your earlier hand
resolve.
...
...
@@ -150,33 +150,32 @@ Running the 'git-rerere' command immediately after a conflicted
automerge records the conflicted working tree files, with the
usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in
them. Later, after you are done resolving the conflicts,
running 'git-rerere' again
records
the resolved state of these
running 'git-rerere' again
will record
the resolved state of these
files. Suppose you did this when you created the test merge of
master into the topic branch.
Next time, running 'git-rerere' after seeing a conflicted
automerge, if the conflict is the same as the earlier one
recorded, it is noticed and a three-way merge between the
Next time, after seeing the same conflicted automerge,
running 'git-rerere' will perform a three-way merge between the
earlier conflicted automerge, the earlier manual resolution, and
the current conflicted automerge
is performed by the command
.
the current conflicted automerge.
If this three-way merge resolves cleanly, the result is written
out to your working tree file, so you
would
not have to manually
out to your working tree file, so you
do
not have to manually
resolve it. Note that 'git-rerere' leaves the index file alone,
so you still need to do the final sanity checks with `git diff`
(or `git diff -c`) and 'git-add' when you are satisfied.
As a convenience measure, 'git-merge' automatically invokes
'git-rerere'
when it exits with a failed automerge, which
records
it if
it is a new conflict, or reuses the earlier hand
'git-rerere'
upon exiting with a failed automerge and 'git-rerere'
records
the hand resolve when
it is a new conflict, or reuses the earlier hand
resolve when it is not. 'git-commit' also invokes 'git-rerere'
when
record
ing a merge result. What this means is that you do
not have to do anything special yourself (
Note: you still have
t
o set the config variable rerere.enabled to enable this command
).
when
committ
ing a merge result. What this means is that you do
not have to do anything special yourself (
besides enabling
t
he rerere.enabled config variable
).
In our example, when you d
id
the test merge, the manual
In our example, when you d
o
the test merge, the manual
resolution is recorded, and it will be reused when you do the
actual merge later with updated master and topic branch, as long
as the
earlier
resolution is still applicable.
actual merge later with
the
updated master and topic branch, as long
as the
recorded
resolution is still applicable.
The information 'git-rerere' records is also used when running
'git-rebase'. After blowing away the test merge and continuing
...
...
@@ -194,11 +193,11 @@ development on the topic branch:
o---o---o---*---o---o---o---o master
------------
you could run `git rebase master topic`, to
keep
yourself
up-to-date
even
before your topic is ready to be sent upstream.
This would result in falling back to three-way merge, and it
would conflict the same way the test merge you resolved earlier.
'git-rerere'
is
run by 'git-rebase' to help you resolve this
you could run `git rebase master topic`, to
bring
yourself
up-to-date before your topic is ready to be sent upstream.
This would result in falling back to
a
three-way merge, and it
would conflict the same way
as
the test merge you resolved earlier.
'git-rerere'
will be
run by 'git-rebase' to help you resolve this
conflict.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录