Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
779b1f7e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
779b1f7e
编写于
9月 06, 2019
作者:
R
Russell Dickenson
提交者:
Marcia Ramos
9月 06, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Docs: explain what is a diff
上级
78174ece
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
0 deletion
+22
-0
doc/user/admin_area/diff_limits.md
doc/user/admin_area/diff_limits.md
+2
-0
doc/user/project/merge_requests/img/merge_request_diff_v12_2.png
...r/project/merge_requests/img/merge_request_diff_v12_2.png
+0
-0
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+20
-0
未找到文件。
doc/user/admin_area/diff_limits.md
浏览文件 @
779b1f7e
...
...
@@ -6,6 +6,8 @@ type: reference
You can set a maximum size for display of diff files (patches).
For details about diff files,
[
View changes between files
](
../project/merge_requests/index.md#view-changes-between-file-versions
)
.
## Maximum diff patch size
Diff files which exceed this value will be presented as 'too large' and won't
...
...
doc/user/project/merge_requests/img/merge_request_diff_v12_2.png
0 → 100644
浏览文件 @
779b1f7e
133.0 KB
doc/user/project/merge_requests/index.md
浏览文件 @
779b1f7e
...
...
@@ -164,6 +164,26 @@ you hide threads that are no longer relevant.
[
Read more about resolving threads in merge requests reviews.
](
../../discussions/index.md
)
## View changes between file versions
The
**Changes**
tab of a merge request shows the changes to files between branches or
commits. This view of changes to a file is also known as a
**diff**
. By default, the diff view
compares the file in the merge request branch and the file in the target branch.
The diff view includes the following:
-
The file's name and path.
-
The number of lines added and deleted.
-
Buttons for the following options:
-
Toggle comments for this file; useful for inline reviews.
-
Edit the file in the merge request's branch.
-
Show full file, in case you want to look at the changes in context with the rest of the file.
-
View file at the current commit.
-
Preview the changes with
[
Review Apps
](
../../../ci/review_apps/index.md
)
.
-
The changed lines, with the specific changes highlighted.
![
Example screenshot of a source code diff
](
img/merge_request_diff_v12_2.png
)
## Commenting on any file line in merge requests
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录