Timeline for Squash 2 commits into 1
Current License: CC BY-SA 4.0
6 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 25, 2019 at 10:31 | vote | accept | runnerpaul | ||
| Mar 21, 2019 at 15:16 | comment | added | Mark Adelsberger | @benhorgen - I'm not sure what you mean. A rebase can indeed squash commits. It is true that the original commits are preserved (at least temporarily) after any rebase, but the same is true of the rebase-and-recommit method. | |
| Mar 21, 2019 at 14:43 | history | edited | Romain Valeri | CC BY-SA 4.0 |
added 11 characters in body
|
| Mar 21, 2019 at 14:43 | comment | added | Romain Valeri |
@benhorgen You're right. It's unclear from my answer but I did refer to interactive rebasing (then choosing squash where it should) rather than "normal" rebasing.
|
|
| Mar 21, 2019 at 14:38 | comment | added | benhorgen |
Rebasing is an especially helpful feature in Git but it will not squash commits, it will do the opposite and preserve each commit. The reset then commit process you laid out is perfect for squashing the commit history.
|
|
| Mar 21, 2019 at 14:29 | history | answered | Romain Valeri | CC BY-SA 4.0 |