diff options
| author | xmo-odoo <xmo-odoo@users.noreply.github.com> | 2014-05-19 09:48:28 +0200 |
|---|---|---|
| committer | xmo-odoo <xmo-odoo@users.noreply.github.com> | 2014-05-19 09:48:28 +0200 |
| commit | 5313714530d4ccc3ae0557bf05e08ffb1431e3b1 (patch) | |
| tree | 5919520dad9ffa83251218f4e27339c8b1b66167 /doc/git.rst | |
| parent | 24d594ab94a0d82ba0e7d832fd96b567b956df56 (diff) | |
[FIX] replace a few more references to trunk with master
Diffstat (limited to 'doc/git.rst')
| -rw-r--r-- | doc/git.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/git.rst b/doc/git.rst index b2e24db9036..d66ca33180b 100644 --- a/doc/git.rst +++ b/doc/git.rst @@ -70,14 +70,14 @@ Basic development workflow * update your remotes with ``git fetch --all`` * create your development branch with ``git checkout -b <branch_name> <source_branch>``. For instance if you wanted to add support for full-text - search in trunk you could use ``git checkout -b trunk-fts-xxx odoo/master`` + search in master you could use ``git checkout -b master-fts-xxx odoo/master`` * do your changes, stage them with ``git add`` and commit them with ``git commit`` * if your branch is long-lived, you may want to update it to its parent - update the remotes with ``git fetch --all`` - merge the remote branch into the local one with ``git merge --no-ff - odoo/trunk`` + odoo/master`` * to push the branch to the development repository, use ``git push -u dev <branchname>``, this will automatically create a branch called |