almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

Doc: Replace fetch & fetch tags & merge combo with pull --rebase 

$ git pull --rebase upstream master
will work also when there are commits on master branch - it will
just rebase the changes seamlessly in opposite to git merge.

Moreover by using git pull --rebase we will save two calls of git.
This commit is contained in:
Tomas Mlcoch 2015-09-09 03:57:24 -04:00
parent 2599a42a14
commit 291c509c2f
1 changed files with 2 additions and 6 deletions
Show Stats 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
git checkout master
git fetch upstream
git fetch upstream --tags
git merge upstream/master
git pull --rebase upstream master
git push origin master
git push origin --tags
git checkout my_topic_branch
@ -64,9 +62,7 @@ Currently the development workflow for Pungi is on master branch:
else
pullup_startbranch=$(git describe --contains --all HEAD)
git checkout $1
git fetch upstream
git fetch upstream --tags
git merge upstream/$1
git pull --rebase upstream master
git push origin $1
git push origin --tags
git checkout ${pullup_startbranch}