summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleungpeng <leungpeng@gmail.com>2017-06-29 15:37:55 +0000
committerleungpeng <leungpeng@gmail.com>2017-06-29 15:37:55 +0000
commit651e32fd5ae382e6afa3a46993b0f62659b35f6d (patch)
tree92d938baa76c871d2a1969b12bd868d51ed443b6
parent5a983ac431affc800d5e9db9e83c14710ec29c36 (diff)
downloadgitlab-ce-651e32fd5ae382e6afa3a46993b0f62659b35f6d.tar.gz
Fixed typo in gitlab_flow.md
-rw-r--r--doc/workflow/gitlab_flow.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md
index e10ccc4fc46..ea28968fbb2 100644
--- a/doc/workflow/gitlab_flow.md
+++ b/doc/workflow/gitlab_flow.md
@@ -300,7 +300,7 @@ If there are no merge conflicts and the feature branches are short lived the ris
If there are merge conflicts you merge the master branch into the feature branch and the CI server will rerun the tests.
If you have long lived feature branches that last for more than a few days you should make your issues smaller.
-## Working wih feature branches
+## Working with feature branches
![Shell output showing git pull output](git_pull.png)