Timeline for How do I squash all commits without losing submodules?
Current License: CC BY-SA 4.0
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Sep 20, 2020 at 19:26 | history | edited | MrTux | CC BY-SA 4.0 |
edited body
|
| May 14, 2015 at 12:14 | comment | added | J0hnG4lt | This is brilliant. I guess this would preserve peoples branches too. | |
| May 14, 2015 at 12:12 | vote | accept | J0hnG4lt | ||
| May 14, 2015 at 12:04 | comment | added | user743382 |
No, in general, it doesn't. After git reset --mixed, you'd have to worry about re-updating your index to the exact state it was in before you executed git reset, and that's not necessarily trivial.
|
|
| May 14, 2015 at 12:04 | history | edited | MrTux | CC BY-SA 3.0 |
deleted 1 character in body
|
| May 14, 2015 at 12:03 | comment | added | MrTux | but iirc mixed also does the job innthis case, right? | |
| May 14, 2015 at 12:01 | comment | added | user743382 |
No, git reset --mixed resets the index. (--mixed is the default, by the way.) --soft is the option to leave the index as it is.
|
|
| May 14, 2015 at 11:57 | history | answered | MrTux | CC BY-SA 3.0 |