sheerun / git-squash

Locally squash commits on a branch without resolving any conflicts (a'la squash and merge)

git squash

Locally squash commits on a branch, without needing to resolve any conflicts 🧈

It works just like GitHub's "Squash and merge" or GitLab's "Squash commits".

Installation

With Homebrew on MacOS and Linux:

brew install sheerun/git-squash/git-squash

With curl on MacOS and Linux, including Windows Subsystem for Linux:

curl https://raw.githubusercontent.com/sheerun/git-squash/master/git-squash > /usr/local/bin/git-squash && chmod a+x /usr/local/bin/git-squash

Usage

# This tool requires that target branch is mergable to current one
# The easiest way to ensure it is to merge it and resolve any conflicts
git merge master
# Squash all changes on current branch that happened since master branch
git squash master

License

MIT

git-squash's Issues

Might be worth tagging your 1.0.1 release as the latest release.

Homebrew is still pulling the 1.0.0 version as the latest. 👍

hard coded master

as far as I see this master:

https://github.com/sheerun/git-squash/blob/master/git-squash#L28

should be the branch from the first parameter. So it works if the first parameter is master - but fails in other cases (like mine) with "There are no changes to be squashed"

Untracked files also included in the commits

Hi I loved this small git utility and helped me a lot to keep my git history clean and do it quickly.
Only one problem I am facing is, if I have any untracked files they also getting committed to squashed commit. Is there anyway to ignore untracked files automatically.
Right now, I have to move them to a different folder or add them to .gitignore file or move it to folder outside git repo.