summaryrefslogtreecommitdiff
path: root/doc/workflow/README.md
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-09-19 00:24:02 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-09-19 23:48:40 -0500
commitfab5567a09cffe4f070913ff3a2205ece0e31904 (patch)
tree71f4eb9dc00af7909f68eb21671d0e56dcbe1693 /doc/workflow/README.md
parentfb59f55f47c3b19c0cebcba319cbe89c8db3d509 (diff)
downloadgitlab-ce-fab5567a09cffe4f070913ff3a2205ece0e31904.tar.gz
Update fast-forward doc links to point at own docs
Diffstat (limited to 'doc/workflow/README.md')
-rw-r--r--doc/workflow/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 673e08287a3..6b2aba47f54 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -36,6 +36,7 @@
- [Revert changes in the UI](../user/project/merge_requests/revert_changes.md)
- [Merge requests versions](../user/project/merge_requests/versions.md)
- ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md)
+ - [Fast-forward merge requests](../user/project/merge_requests/fast_forward_merge.md)
- [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md)
- [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md)
- [Todos](todos.md)