Menu
If I have made multiple sets of changes to a large file, is it possible to split those into separate commits using git?
287
Workflow for Splitting git Commits When git presents the commit that you want to split: Reset state to the previous commit using git reset HEAD^ Use git add to carefully and incrementally add changes to the index. Run git commit when you have a set of atomic changes that you are ready to commit.
To "squash" in Git means to combine multiple commits into one. You can do this at any point in time (by using Git's "Interactive Rebase" feature), though it is most often done when merging branches. Please note that there is no such thing as a stand-alone git squash command.
You can do this fairly easily without git rebase or git merge --squash . In this example, we'll squash the last 3 commits. Both of those methods squash the last three commits into a single new commit in the same way. The soft reset just re-points HEAD to the last commit that you do not want to squash.
You want git add --patch (documentation), which will allow you to select which changes to stage.
114
Yes, you can -- use git add -i to select which hunks you want to stage for each commit. You can get documentation by running git help add and scrolling to "Interactive Mode".
28
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
