From 291c509c2f279e913cccf9040644aadf3c5da49f Mon Sep 17 00:00:00 2001 From: Tomas Mlcoch Date: Wed, 9 Sep 2015 03:57:24 -0400 Subject: [PATCH] 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. --- doc/contributing.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/contributing.rst b/doc/contributing.rst index 84fed632..eea20c77 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -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}