diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 00:04:19 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | 8e7b88155658165baf70981033a9737ee0ad09f2 (patch) | |
| tree | 0592e316c9795136b53e92f71f7e9011568453f5 | |
| parent | f7f9847b26fd9f401039908843de2b660473e73d (diff) | |
| download | gitlab-ce-8e7b88155658165baf70981033a9737ee0ad09f2.tar.gz | |
Update fast-forward mr widget docs and add images
| -rw-r--r-- | doc/user/project/merge_requests/fast_forward_merge.md | 4 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/img/ff_merge_mr.png | bin | 0 -> 21380 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/img/ff_merge_rebase_locally.png | bin | 0 -> 21013 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/merge_requests/fast_forward_merge.md b/doc/user/project/merge_requests/fast_forward_merge.md index 610a01a205f..085170d9f03 100644 --- a/doc/user/project/merge_requests/fast_forward_merge.md +++ b/doc/user/project/merge_requests/fast_forward_merge.md @@ -28,8 +28,8 @@ Now, when you visit the merge request page, you will be able to accept it  If the target branch is ahead of the source branch, you need to rebase the -source branch before you will be able to do a fast-forward merge. +source branch locally before you will be able to do a fast-forward merge. - + [ffonly]: https://git-scm.com/docs/git-merge#git-merge---ff-only diff --git a/doc/user/project/merge_requests/img/ff_merge_mr.png b/doc/user/project/merge_requests/img/ff_merge_mr.png Binary files differnew file mode 100644 index 00000000000..241cc990343 --- /dev/null +++ b/doc/user/project/merge_requests/img/ff_merge_mr.png diff --git a/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png b/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png Binary files differnew file mode 100644 index 00000000000..fb412296efc --- /dev/null +++ b/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png |
