Updated Branching Merging (markdown)
parent
f634de32f3
commit
2e8db72be9
1 changed files with 3 additions and 2 deletions
|
@ -20,14 +20,15 @@ git rebase origin/master
|
|||
|
||||
When working locally, do whatever you want. Before sharing, clean up your history into logical commits and write good commit messages for them.
|
||||
|
||||
*Tip: make lots of small commits, then squash them into one or several bigger commits before pushing. This helps organize your work, so that logically separate changes can be placed into separate commits without manually splitting an existing commit*
|
||||
|
||||
```
|
||||
git fetch
|
||||
git rebase -i origin/master
|
||||
git push -u origin your_branch_name
|
||||
```
|
||||
|
||||
*Tip: make lots of small commits, then squash them into one or several bigger commits before pushing. This helps organize your work, so that logically separate changes can be placed into separate commits without manually splitting an existing commit*
|
||||
|
||||
|
||||
## Rebase and non-ff-merge into master when you're done
|
||||
|
||||
```
|
||||
|
|
Loading…
Reference in a new issue