Timeline for How do I squash my last N commits together?
Current License: CC BY-SA 4.0
10 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Aug 4, 2023 at 22:24 | history | edited | Benjamin Loison | CC BY-SA 4.0 |
Add Shell syntax highlighting
|
| Nov 17, 2022 at 11:31 | comment | added | Nishant Lakhara | do we need to push forcefully to remote branch. the commits are already present on remote | |
| Nov 12, 2018 at 15:32 | comment | added | Jared | As continuation to my comment. When I create a merge branch, then merge feature branch into it, squashing works fine. It requires a little more work, but still less than cherry-picking everything by hand. | |
| Nov 12, 2018 at 14:57 | comment | added | Jared | For some reason this overwrites existing changes on master that have been pushed to it after I branched off master to create feature branch. Not sure why though. I will try doing it the other way, as mentioned in the linked article. | |
| Dec 4, 2015 at 10:50 | comment | added | trudolf | yes, hence it squashes all of your commits into one. congratulations! | |
| Dec 3, 2015 at 6:26 | comment | added | IgorGanapolsky | @trudolf This isn't really squashing (picking individual commits to squash). This is more of committing all of your changes at once. | |
| Dec 3, 2015 at 5:54 | comment | added | trudolf | could you elaborate that a bit further @igorGanapolsky ? | |
| Oct 22, 2015 at 16:26 | comment | added | IgorGanapolsky | This does not squash previous commits! | |
| Jul 10, 2015 at 12:34 | comment | added | David Victor | Just what I needed. Squash down commits from my feature branch, and then I git cherry pick that commit into my master. | |
| May 22, 2014 at 0:41 | history | answered | trudolf | CC BY-SA 3.0 |