admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1449 from PowerShell/vors/git-rebase

Browse Source 
Simplify update sync local repo workflow in powershell-repository-101.md
This commit is contained in:
Sergei Vorobev
2016-07-20 17:59:03 -07:00
committed by GitHub
parent 46692c7d4d 20209c0497
commit 47e5e9db49
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/git/powershell-repository-101.md
+2 -12
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