Git – squash entire branch – one line squash command

while I am working on new code I make many small commits to track my changes. My company however prefers each feature to be committed in a single commit. So the solution is to squash my entire branch down to a single commit.

How do I squash an entire branch without using git rebase --interactive and then changing pick to squash for all the commits?

  • Do a “git export” (like “svn export”)?
  • Heroku permission denied / unable to connect to heroku api
  • Do you have to run Composer on localhost and on production?
  • Does “pure git” have the concept of a pull request?
  • Why is indentation in empty lines bad?
  • Adding a folder from an Eclipse project to Git source control
  • Git checkout does not throw away my changes
  • Error when using SourceTree with Git: 'Summary' failed with code 128: fatal: unable to read tree
  • Github file change notification
  • Split subdirectory from a Git repository and keep history of all files that are in the subdir _now_
  • Delete a commit from github
  • Error starting Git Bash in windows 7
  • 5 Solutions collect form web for “Git – squash entire branch – one line squash command”

    My preferred method is a two-liner (excluding steps 1 and 4 below). The benefits are you do not need to know/record any commit IDs, you can write a simple alias to perform all the steps involved, and your actually moving your entire branch onto origin/master so that the actual merge into master can be a fast-forward and there cannot be any conflicts.

    First, my assumptions:

    • You’re working on a branch called my-feature-branch. This branch has diverged from master by several commits; this is the checked-out branch.
    • Your local master tracks remote branch origin/master
    • You want to squash all of your commits from my-feature-branch into a single commit ontop of the current state of origin/master (not your local master, which may be out of date)
    • All of your changes are committed, you have no unstaged changes (they will be lost during git reset --hard)

    My process is as follows:

    1. Fetch, so origin/master is current:

      $ git fetch
      
    2. Throw away all the commits on your local branch by resetting it to point at origin/master

      $ git reset --mixed origin/master
      
    3. Merge all of your old changes from the previous state of your branch into the index

      $ git merge --squash HEAD@{1}
      
    4. Commit your changes – Git will pre-populate your editor with a commit message containing all the commit messages from the squashed commits

    The simple alias I mentioned would be:

    alias squash="git fetch; git reset --mixed origin/master; git merge --squash HEAD@{1}"
    

    Probably the best option for this would be to use git merge --squash at merge time. That will leave your branch as it developed, which is quite often a lot easier to troubleshoot with, because you’ll have some notion of “I was changing that specific functionality in commit Z”, and looking at that specific commit, you have all the context of any changes you made to multiple files – looking at a single commit that is the squashed results of your development path makes it quite a bit harder to remember “Oh, yeah, I had to change this one other thing in a different file, too…”. You also have the benefit of using git bisect when you have your entire path available – all it could tell you in the squashed case is “this huge commit here broke something”.

    The result of using git merge --squash is a single commit on the branch that you are “merging” into that contains the cumulative changes from your branch, but it leaves your original branch alone.

    Edit your git configuration file ~/.gitconfig and add the following to the alias section

    [alias]
        squash = "!f(){ CUR=`git rev-parse HEAD` && git reset --soft ${1} && git commit -m \"$(git log --format=%B ${1}..${CUR})\"; };f"
    

    This alias gets the current HEAD commit hash, resets back to the commit you specify, and creates a new commit preserving all of the commit messages.

    Usage:

    git squash <refspec>
    

    refspec can be any valid commit reference such as a commit hash, branch name, tag name, HEAD^ HEAD~3

    Find the hash for the commit just before you started the branch and copy it out into the clipboard. Then do a reset to to that hash.

    $ git reset [hash]
    

    Then just re add and re commit the changes in a single message.

    $ git add -A
    $ git commit -m 'EVERYTHING SQUASHED'
    

    I don’t think this is the correct answer for this question.

    But I usually squash my branch before making the Pull Request to the remote upstream master using the following command:

    git rebase -i master
    

    But you will then still have to choose which to pick and squash.

    Git Baby is a git and github fan, let's start git clone.