diff options
| author | Butch Anton <butch@butch.net> | 2016-07-21 16:49:40 +0000 |
|---|---|---|
| committer | Butch Anton <butch@butch.net> | 2016-07-21 16:49:40 +0000 |
| commit | dc7805cd999dc6c97c407cbb419d1bb1cc36a71f (patch) | |
| tree | df24356f0c9d4ccd3446a0d08a4651d9c3cdda88 /doc | |
| parent | 2af769c336e0a2498333ea8b4d7b7c87810ca5f0 (diff) | |
| download | gitlab-ce-dc7805cd999dc6c97c407cbb419d1bb1cc36a71f.tar.gz | |
Update start-using-git.md
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gitlab-basics/start-using-git.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md index 89ce8bcc3e8..b61f436c1a4 100644 --- a/doc/gitlab-basics/start-using-git.md +++ b/doc/gitlab-basics/start-using-git.md @@ -120,3 +120,11 @@ You need to be in the created branch. git checkout NAME-OF-BRANCH git merge master ``` + +### Merge master branch with created branch +You need to be in the master branch. +``` +git checkout master +git merge NAME-OF-BRANCH +``` + |