Merging & Rebasing
So do you rebase, then merge? It looks like rebase just makes changes?
Description | Commands |
---|---|
Merge two branches
|
|
Rebase one branch onto another
|
|
Completely replace |
|
Merge Example
Rebase Example
Reversing Changes
Description | Commands |
---|---|
Reverses changes by moving a branch reference backwards in time to an older commit
|
|
While resetting works great for local branches on your own machine, its method of "rewriting history" doesn't work for remote branches that others are using.
|
|
Moving things around
Description | Commands |
---|---|
Copy a series of commits below your current location (HEAD)
|
|
Git Interactive Rebase
|
|
Git Tags
Description | Commands |
---|---|
Add a tag |
|
Checkout a tag |
|
Push tags to remote |
|
Describe where you currently are relative to the closest "anchor" (aka tag)
|
|
Fetch Arguments Example
Last updated