Timeline for Combining multiple commits before pushing in Git
Current License: CC BY-SA 3.0
15 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Aug 17, 2021 at 10:23 | comment | added | Eduardo Pignatelli |
What if there are 500 pick?
|
|
| Oct 19, 2017 at 8:02 | comment | added | Peter - Reinstate Monica | @TPAKTOPA: For unix users: Save your file and exit in Windows editors is hard. You need about 3 different mouse clicks; alternatively, most editors accept the standard XOFF byte (Ctrl+S) in order to save the file (!). Closing programs is usually possible through the "File" (!) menu, or you press a combination of Alt+F4 (Alt Gr won't work). Make sure you don't have the desktop selected when you do that because it would try to end your Windows session (!). If you are good with mouse aiming you can also try to hit the little "x" button top right. | |
| Aug 25, 2017 at 21:28 | history | edited | Brian Carlton | CC BY-SA 3.0 |
pulled in Andre's comment
|
| Feb 17, 2016 at 16:22 | comment | added | bishop |
git rebase -i @{u}.. in case your upstream isn't origin/master.
|
|
| Dec 15, 2015 at 21:17 | comment | added | TPAKTOPA | For Windows users Save your faile and exit in VIM is hard. You need key combination ESC key , then type :wq then press Enter. You will need to do same for second text file too, which will be loaded after squashing. | |
| Sep 20, 2015 at 1:27 | comment | added | Howiecamp | @Leopd Let's assume I'm working on a repo and there are no remote repos, and that I want to combine multiple arbitrary commits into a single commit. The ones I want to combine are not necessarily contiguous. How would I do this? | |
| Mar 31, 2015 at 18:55 | comment | added | Bennett Brown | @Leopd Does deleting line to "remove the changes" from that commit retain changes to be organized into another squashed commit? Should squash be used to reorganize local commits in that way before pushing upstream? | |
| Oct 16, 2014 at 13:19 | comment | added | Andres | good! you could also use s instead of squash | |
| Oct 9, 2014 at 20:44 | comment | added | EhevuTov | Anyone know if you can have a multiple lined commit msg in your "pick" line, or will it confuse the parser? | |
| Aug 15, 2014 at 16:24 | comment | added | Leopd | @Jusleong you can remove the changes from a commit simply by deleting that line. | |
| Aug 14, 2014 at 17:08 | comment | added | faizal |
Use fixup instead of squash to skip the step of creating a new commit message. The last commit message("All done") will be used automatically for the final commit created by rebase.
|
|
| Aug 7, 2014 at 7:36 | comment | added | Jusleong | That's a cool way to reduce the number of commits, but what if I just want to delete one subcommit, for example: delete "c964dea Getting closer" this subcommit in the commit, Is it possible? | |
| Apr 22, 2014 at 16:04 | comment | added | Asclepius |
By origin/master, do you mean <upstream-branch>? If the upstream branch is configured, is it implicit or must I still specify it?
|
|
| Aug 4, 2011 at 0:28 | vote | accept | muudscope | ||
| Aug 4, 2011 at 0:27 | history | answered | Leopd | CC BY-SA 3.0 |