summaryrefslogtreecommitdiff
path: root/doc/user/project
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-07-11 09:17:35 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-11 09:17:35 +0000
commit2224207b3d86ca5ea0b01e1438388d0eda693a95 (patch)
treedf687cfabfcb093f5bdfc1d11f9042aee27f22ca /doc/user/project
parentdebaf20c0914dd5abe9afd68d0d33c629068203b (diff)
parentb6a807fd8fb86b7303e4b125b2fb0b8664d2dd02 (diff)
downloadgitlab-ce-2224207b3d86ca5ea0b01e1438388d0eda693a95.tar.gz
Merge branch 'chriscool-master-patch-11367' into 'master'
Update doc/user/project/merge_requests/index.md See merge request gitlab-org/gitlab-ce!30517
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/merge_requests/index.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 37a0630d0f3..c299a8ecb96 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -274,7 +274,8 @@ branch already exists, the patches will be applied on top of it.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26752) in GitLab 11.10.
NOTE: **Note:**
-Git push options are only available with Git 2.10 or newer.
+Git push options are only available with Git 2.10 or newer. With Git older than 2.18
+`git push --push-option=...` should be used instead of `git push -o ...`.
GitLab supports using
[Git push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)