Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
cd425a15
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,发现更多精彩内容 >>
提交
cd425a15
编写于
12月 12, 2010
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'mz/rebase-i-verify'
* mz/rebase-i-verify: rebase: support --verify
上级
6b236bfc
7baf9c4b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
0 deletion
+9
-0
Documentation/git-rebase.txt
Documentation/git-rebase.txt
+4
-0
git-rebase--interactive.sh
git-rebase--interactive.sh
+2
-0
git-rebase.sh
git-rebase.sh
+3
-0
未找到文件。
Documentation/git-rebase.txt
浏览文件 @
cd425a15
...
@@ -279,6 +279,10 @@ which makes little sense.
...
@@ -279,6 +279,10 @@ which makes little sense.
--no-verify::
--no-verify::
This option bypasses the pre-rebase hook. See also linkgit:githooks[5].
This option bypasses the pre-rebase hook. See also linkgit:githooks[5].
--verify::
Allows the pre-rebase hook to run, which is the default. This option can
be used to override --no-verify. See also linkgit:githooks[5].
-C<n>::
-C<n>::
Ensure at least <n> lines of surrounding context match before
Ensure at least <n> lines of surrounding context match before
and after each change. When fewer lines of surrounding
and after each change. When fewer lines of surrounding
...
...
git-rebase--interactive.sh
浏览文件 @
cd425a15
...
@@ -28,6 +28,7 @@ continue continue rebasing process
...
@@ -28,6 +28,7 @@ continue continue rebasing process
abort abort rebasing process and restore original branch
abort abort rebasing process and restore original branch
skip skip current patch and continue rebasing process
skip skip current patch and continue rebasing process
no-verify override pre-rebase hook from stopping the operation
no-verify override pre-rebase hook from stopping the operation
verify allow pre-rebase hook to run
root rebase all reachable commmits up to the root(s)
root rebase all reachable commmits up to the root(s)
autosquash move commits that begin with squash!/fixup! under -i
autosquash move commits that begin with squash!/fixup! under -i
"
"
...
@@ -749,6 +750,7 @@ do
...
@@ -749,6 +750,7 @@ do
OK_TO_SKIP_PRE_REBASE
=
yes
OK_TO_SKIP_PRE_REBASE
=
yes
;;
;;
--verify
)
--verify
)
OK_TO_SKIP_PRE_REBASE
=
;;
;;
--continue
)
--continue
)
is_standalone
"
$@
"
||
usage
is_standalone
"
$@
"
||
usage
...
...
git-rebase.sh
浏览文件 @
cd425a15
...
@@ -206,6 +206,9 @@ do
...
@@ -206,6 +206,9 @@ do
--no-verify
)
--no-verify
)
OK_TO_SKIP_PRE_REBASE
=
yes
OK_TO_SKIP_PRE_REBASE
=
yes
;;
;;
--verify
)
OK_TO_SKIP_PRE_REBASE
=
;;
--continue
)
--continue
)
test
-d
"
$dotest
"
-o
-d
"
$GIT_DIR
"
/rebase-apply
||
test
-d
"
$dotest
"
-o
-d
"
$GIT_DIR
"
/rebase-apply
||
die
"No rebase in progress?"
die
"No rebase in progress?"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录