robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #56 doc/contributing.rst update

Browse source
This commit is contained in:
Tomas Mlcoch 2015-09-09 03:57:24 -04:00
commit 36fff71059
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/contributing.rst
View file

@ -40,9 +40,7 @@ Currently the development workflow for Pungi is on master branch:
# now we rebase # now we rebase
git checkout master git checkout master
git fetch upstream git pull --rebase upstream master
git fetch upstream --tags
git merge upstream/master
git push origin master git push origin master
git push origin --tags git push origin --tags
git checkout my_topic_branch git checkout my_topic_branch
@ -64,9 +62,7 @@ Currently the development workflow for Pungi is on master branch:
else else
pullup_startbranch=$(git describe --contains --all HEAD) pullup_startbranch=$(git describe --contains --all HEAD)
git checkout $1 git checkout $1
git fetch upstream git pull --rebase upstream master
git fetch upstream --tags
git merge upstream/$1
git push origin $1 git push origin $1
git push origin --tags git push origin --tags
git checkout ${pullup_startbranch} git checkout ${pullup_startbranch}