Skip to content
Snippets Groups Projects
Commit f6a43d7a authored by Martin Ritter's avatar Martin Ritter
Browse files

Expanded rebase section

parent b26f868c
Branches branch_rebase
No related tags found
No related merge requests found
......@@ -24,3 +24,23 @@ Rebasing
Rebasing is an alternative to merging and should *only and exclusively* be used
on code which is not published: It *rewrites the history* (and is not allowed
in the softare repository).
What it does is take a branch of the tree and try to attach it to somewhere
else with the structure
```
*---A--B--C <-- master
\
--D--E <-- mybranch
```
`git rebase master` will take the commits D and E and attach them to C. If successful the new structure will be
```
*---A--B--C <-- master,
\
--D'--E' <-- mybranch
```
with D' and E' containing the same changes and commit message but it will be
different commits.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment