From 5313714530d4ccc3ae0557bf05e08ffb1431e3b1 Mon Sep 17 00:00:00 2001
From: xmo-odoo <xmo-odoo@users.noreply.github.com>
Date: Mon, 19 May 2014 09:48:28 +0200
Subject: [PATCH] [FIX] replace a few more references to trunk with master

---
 doc/git.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/git.rst b/doc/git.rst
index b2e24db90362..d66ca33180b6 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
-- 
GitLab