0

I made the mistake of making too many small commits after committing big changes and then realizing I missed something minor when comparing changes to master in a pull request.

How could I go about removing the previous commits I've made on my branch, and then make just one comprehensive commit with all of the changes I've made? I don't want to revert the code on my local machine to a previous commit.

Improve this question
3
  • 3
    Key search phrase: squashing.
    – Oliver Charlesworth
    Commented Jun 16, 2017 at 16:46
  • The good news is that if you made a bunch of small commits and haven't pushed yet, ye shall have salvation from embarrassment. Pretty much just look up squashing like Oliver suggested.
    – user7851115
    Commented Jun 16, 2017 at 16:49
  • Thanks for pointing out that this is a duplicate. If I do: $ git rebase -i <branch> will this squash only commits in my branch? I don't want to squash any commits in master.
    – Kaisermania
    Commented Jun 16, 2017 at 16:55
Related questions
20374
How do I delete a Git branch locally and remotely?
26514
How do I undo the most recent local commits in Git?
11690
How can I rename a local Git branch?
Load 7 more related questions Show fewer related questions

0

Reset to default

Browse other questions tagged or ask your own question.