Repository : ssh://git@diktynna/doc
On branches: backup-redmine/2023-01-14,main
commit 2f8250c296ba32ee0a3c57ec572496556b99828f Author: Sven Eckelmann sven@narfation.org Date: Sat Dec 17 13:31:12 2022 +0000
doc: open-mesh/UsingBatmanGit: switch to non-controversy git branch names
2f8250c296ba32ee0a3c57ec572496556b99828f open-mesh/UsingBatmanGit.textile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/open-mesh/UsingBatmanGit.textile b/open-mesh/UsingBatmanGit.textile index 78a3f4e6..ad11971f 100644 --- a/open-mesh/UsingBatmanGit.textile +++ b/open-mesh/UsingBatmanGit.textile @@ -21,27 +21,27 @@ h2. Branches
The main git repository is divided into several branches to make working easier.
-h3. master branch +h3. main branch
-The master branch will have all upcoming changes. Bugfixes are merged from maint to master. +The main branch will have all upcoming changes. Bugfixes are merged from stable to main.
-h3. maint branch +h3. stable branch
-The maint only gathers bug fixes for the last release. +The stable only gathers bug fixes for the last release.
Create branch associated with the remote-tracking branch after cloning the repository
<pre> -git switch -c maint --track origin/maint +git switch -c stable --track origin/stable </pre>
-Cherry-picking a commit from master branch +Cherry-picking a commit from main branch
<pre> -git switch maint +git switch stable git cherry-pick $SHA1 </pre>
h3. Linux integration
-The linux-merge repository is a clone of netdev's net-next tree. With the help of some git voodoo the master branch is merged with this branch in the folder: net/batman-adv/. If you wish to merge the latest master branch changes into the linux branch you need to [[batman-adv:SubmittingLinux|pull the newest changes in master from the batman-adv.git]] repository. \ No newline at end of file +The linux-merge repository is a clone of netdev's net-next tree. With the help of some git voodoo the main branch is merged with this branch in the folder: net/batman-adv/. If you wish to merge the latest main branch changes into the linux branch you need to [[batman-adv:SubmittingLinux|pull the newest changes in main from the batman-adv.git]] repository. \ No newline at end of file