Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinsik Yoon <yms9654@gmail.com>2015-10-22 03:55:35 +0300
committer윤민식 <minsik.yoon@samsung.com>2015-11-13 10:53:53 +0300
commit3d0efa8e0a359c84485a0fd7a3317745bf5648b8 (patch)
tree6bcc5739a8bba9a1bea8d787f687a56f3f919bb3 /doc/workflow/merge_requests.md
parent23ed732e39d4e40e9a8643c015fd167b1e654470 (diff)
Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
Diffstat (limited to 'doc/workflow/merge_requests.md')
-rw-r--r--doc/workflow/merge_requests.md12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
index 751e19da7f1..6d57b5d98cd 100644
--- a/doc/workflow/merge_requests.md
+++ b/doc/workflow/merge_requests.md
@@ -38,3 +38,15 @@ To check out a particular merge request:
```
$ git checkout origin/merge-requests/1
```
+
+## Ignore whitespace changes in Merge Request diff view
+
+![MR diff](merge_requests/merge_request_diff.png)
+
+It you add `w=1` option to URL, you can see diff without whitespace changes.
+
+![MR diff without whitespace](merge_requests/merge_request_diff_without_whitespace.png)
+
+It is also working on commits compare view.
+
+![Commit Compare](merge_requests/commit_compare.png)