maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify update sync local repo workflow in powershell-repository-101.md

Browse source 
The best way to sync a branch for our purposes is to rebase
on origin/master
This commit is contained in:
Sergei Vorobev 2016-07-20 15:10:41 -07:00 committed by GitHub
parent 9359bcaeee
commit 20209c0497
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docs/git/powershell-repository-101.md
View file

@ -45,23 +45,13 @@ Branches
Use **git rebase** instead of **git merge** and **git pull**, when you're updating your feature-branch.
```sh
# switch to master branch
# fetch updates all remote branch references in the repo and all submodules
# --all : tells it to do it for all remotes (handy, when you use your fork)
# -p : tells it to remove obsolete remote branch references (when they are removed from remote)
git fetch --all -p
# pull updates your local files
# you should call this command ONLY from master branch
git pull origin master
```
Then switch to your branch and do a rebase
```
git rebase master
# rebase on origin/master will rewrite your branch history
git rebase origin/master
```
#### More complex scenarios