diff options
| author | Minsik Yoon <yms9654@gmail.com> | 2015-10-22 09:55:35 +0900 |
|---|---|---|
| committer | 윤민식 <minsik.yoon@samsung.com> | 2015-11-13 16:53:53 +0900 |
| commit | 3d0efa8e0a359c84485a0fd7a3317745bf5648b8 (patch) | |
| tree | 6bcc5739a8bba9a1bea8d787f687a56f3f919bb3 /doc/workflow | |
| parent | 23ed732e39d4e40e9a8643c015fd167b1e654470 (diff) | |
| download | gitlab-ce-3d0efa8e0a359c84485a0fd7a3317745bf5648b8.tar.gz | |
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')
| -rw-r--r-- | doc/workflow/merge_requests.md | 12 | ||||
| -rw-r--r-- | doc/workflow/merge_requests/commit_compare.png | bin | 0 -> 89631 bytes | |||
| -rw-r--r-- | doc/workflow/merge_requests/merge_request_diff.png | bin | 0 -> 120422 bytes | |||
| -rw-r--r-- | doc/workflow/merge_requests/merge_request_diff_without_whitespace.png | bin | 0 -> 98887 bytes |
4 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 + + + +It you add `w=1` option to URL, you can see diff without whitespace changes. + + + +It is also working on commits compare view. + + diff --git a/doc/workflow/merge_requests/commit_compare.png b/doc/workflow/merge_requests/commit_compare.png Binary files differnew file mode 100644 index 00000000000..46b3a56a59b --- /dev/null +++ b/doc/workflow/merge_requests/commit_compare.png diff --git a/doc/workflow/merge_requests/merge_request_diff.png b/doc/workflow/merge_requests/merge_request_diff.png Binary files differnew file mode 100644 index 00000000000..ed08ae91bec --- /dev/null +++ b/doc/workflow/merge_requests/merge_request_diff.png diff --git a/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png Binary files differnew file mode 100644 index 00000000000..67d67a64d12 --- /dev/null +++ b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png |
