https://github.com/sheerun/git-squash
Locally squash commits on a branch without resolving any conflicts (a'la squash and merge)
https://github.com/sheerun/git-squash
git github gitlab squash-and-merge
Last synced: 2 months ago
JSON representation
Locally squash commits on a branch without resolving any conflicts (a'la squash and merge)
- Host: GitHub
- URL: https://github.com/sheerun/git-squash
- Owner: sheerun
- License: mit
- Created: 2020-06-01T11:13:19.000Z (about 5 years ago)
- Default Branch: master
- Last Pushed: 2023-11-03T12:44:14.000Z (over 1 year ago)
- Last Synced: 2025-03-19T07:37:48.660Z (3 months ago)
- Topics: git, github, gitlab, squash-and-merge
- Language: Shell
- Homepage:
- Size: 14.6 KB
- Stars: 159
- Watchers: 7
- Forks: 10
- Open Issues: 3
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# 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](https://brew.sh/) 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
```sh
# 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