Differences

This shows you the differences between two versions of the page.

--- ubuntu:git:git_rebase [2019/11/29 15:04] – created peter
+++ ubuntu:git:git_rebase [2020/07/15 09:30] (current) – external edit 127.0.0.1
@@ Line 23: / Line 23: @@
 which will replay only the changes to topic2 not common to topic1 to master.
+----
-===== vs. Merge =====
+===== GIT Revase vs. Merge =====
+Merge will give you a record of exactly what happened during the entire history.
+Rebase will clean up that story so that it's easier for developers to see how the project was created.
+Rebase locally to clean up the story before you push.
+<WRAP alert>
+Never rebase after you've pushed.
+</WRAP>
-Merge will give you a record of exactly what happened during the entire history.  Rebase will clean up that story so that it's easier for developers to see how the project was created.  Rebase locally to clean up the story before you push.  Never rebase after you've pushed.