Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
bda02ebc
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,发现更多精彩内容 >>
提交
bda02ebc
编写于
3月 26, 2012
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ph/rerere-doc' into maint
* ph/rerere-doc: rerere: Document 'rerere remaining'
上级
ed6ce438
3e7a1df8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
7 deletion
+12
-7
Documentation/git-rerere.txt
Documentation/git-rerere.txt
+12
-7
未找到文件。
Documentation/git-rerere.txt
浏览文件 @
bda02ebc
...
...
@@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
[verse]
'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
'git rerere' ['clear'|'forget' <pathspec>|'diff'|'
remaining'|'
status'|'gc']
DESCRIPTION
-----------
...
...
@@ -37,30 +37,35 @@ its working state.
'clear'::
This resets
the metadata used by rerere if a merge resolution is to be
Reset
the metadata used by rerere if a merge resolution is to be
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
will automatically invoke this command.
'forget' <pathspec>::
This resets
the conflict resolutions which rerere has recorded for the current
Reset
the conflict resolutions which rerere has recorded for the current
conflict in <pathspec>.
'diff'::
This displays
diffs for the current state of the resolution. It is
Display
diffs for the current state of the resolution. It is
useful for tracking what has changed while the user is resolving
conflicts. Additional arguments are passed directly to the system
'diff' command installed in PATH.
'status'::
Like 'diff', but this only prints the filenames that will be tracked
for resolutions.
Print paths with conflicts whose merge resolution rerere will record.
'remaining'::
Print paths with conflicts that have not been autoresolved by rerere.
This includes paths whose resolutions cannot be tracked by rerere,
such as conflicting submodules.
'gc'::
This prunes
records of conflicted merges that
Prune
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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录