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:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-04-06 00:09:49 +0300
committerAlfredo Sumaran <alfredo@gitlab.com>2016-04-26 22:01:40 +0300
commit5d5df26ab1b65b094eaa2ca2ca6db49b6d8530ea (patch)
tree6de08f70742d444a1f823feb7738f5170cf01468 /doc/workflow/merge_requests.md
parenta1a9a1cf8d26fc85598eb982a78720282055a96f (diff)
Add documentation for "Hide whitespace changes" button
Diffstat (limited to 'doc/workflow/merge_requests.md')
-rw-r--r--doc/workflow/merge_requests.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
index 6d57b5d98cd..3a47838e977 100644
--- a/doc/workflow/merge_requests.md
+++ b/doc/workflow/merge_requests.md
@@ -12,9 +12,9 @@ Locate the section for your GitLab remote in the `.git/config` file. It looks li
fetch = +refs/heads/*:refs/remotes/origin/*
```
-Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section.
+Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section.
-It should looks like this:
+It should look like this:
```
[remote "origin"]
@@ -43,7 +43,7 @@ $ git checkout origin/merge-requests/1
![MR diff](merge_requests/merge_request_diff.png)
-It you add `w=1` option to URL, you can see diff without whitespace changes.
+If you click to "Hide whitespace changes" button, you can see diff without whitespace changes.
![MR diff without whitespace](merge_requests/merge_request_diff_without_whitespace.png)