Probably the sharpest git repository organizer & rebase/merge workflow automation tool you've ever seen
Project description
git-machete
git machete is a versatile tool for organizing your git repo, including features like:
- Neat, customizable
git machete status
that shows what branches are in sync with their parent branch/remote tracking branch and which of them need to be rebased/merged/pulled/pushed
- Semi-automatic traversal of the branches that helps you effortlessly rebase, merge, push and pull the branches you care for (
git machete traverse
)
- Automatic discovery of branch relations (
git machete discover
)
Install
We suggest a couple of alternative ways of installation.
Bash and zsh completion scripts are provided in completion/ directory, see wiki for their installation instructions.
git-machete works under both Python 2.7 and Python 3.x.
Using Homebrew (macOS)
brew tap VirtusLab/git-machete
brew install git-machete
Using PPA (Ubuntu)
Tip: run sudo apt-get install -y software-properties-common
first if add-apt-repository
is not available on your system.
sudo add-apt-repository ppa:virtuslab/git-machete
sudo apt-get update
sudo apt-get install -y python3-git-machete
Using rpm (Fedora/RHEL/CentOS/openSUSE...)
Download the rpm package from the latest release
and install either by opening it in your desktop environment or with rpm -i git-machete-*.noarch.rpm
.
Using AUR (Arch Linux)
Install the AUR package git-machete using an AUR helper of your preference.
Using Nix (macOS & most Linux distributions)
On macOS and most Linux distributions, you can install via Nix:
nix-channel --add https://nixos.org/channels/nixos-unstable unstable # if you haven't set up any channels yet
nix-env -i git-machete
Using pip with sudo (system-wide install)
You need to have Python and pip
installed from system packages.
sudo -H pip install git-machete
Using pip without sudo (user-wide install)
You need to have Python and pip
installed from system packages.
pip install --user git-machete
Please verify that your PATH
variable has ${HOME}/.local/bin/
included.
Quick start
cd your-repo/
git machete discover --checked-out-since='2 weeks ago' # increase/decrease the timespan if you want more/less old branches included
# (see and possibly edit the suggested layout of branches - branch layout is always kept as text file .git/machete)
git machete traverse --fetch --start-from=first-root
# (put each branch one by one in sync with its parent and remote counterpart)
Git compatibility
git-machete (since version 2.13.0) is compatible with git >= 1.7.10.
Reference
Take a look at https://medium.com/virtuslab/make-your-way-through-the-git-rebase-jungle-with-git-machete-e2ed4dbacd02 for a guide on how to use the tool.
The more advanced features like automated traversal, upstream inference and tree discovery are described in the second part of the series: https://medium.com/virtuslab/git-machete-strikes-again-traverse-the-git-rebase-jungle-even-faster-with-v2-0-f43ebaf8abb0.
Contribute
To develop that project and run tests locally it is needed to have Python installed with tox
.
Use tox -e venv
to setup virtual environment to work on that project in your favorite IDE. Use .tox/venv/bin/python
as a reference python
interpreter in your IDE.
To run tests execute command tox
.
Project details
Release history Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.
Source Distribution
Built Distribution
Hashes for git_machete-2.13.0-py2.py3-none-any.whl
Algorithm | Hash digest | |
---|---|---|
SHA256 | 968a348ba71c3c0c91650ff15a9c75d1f6d0acb92fcef19465312de0fc4871d6 |
|
MD5 | 875785fedd83cf0d23f233fe9cfff356 |
|
BLAKE2b-256 | 46dd7b0c17753b0cc27083888707c22b1fedfbb595b1e6c70e165bd0677eec71 |