Git Town reduces merge conflicts by keeping Git branches better in sync. Compatible with all major Git workflows including Git Flow, GitHub Flow, GitLab Flow, and trunk-based development. Supports mono-repos and stacked changes. Check out this screencast for an introduction.

• git hack - create a new up-to-date feature branch off the main branch
• git sync - update the current branch with all ongoing changes
• git propose - propose to ship a Git branch
• git ship - merge a completed feature branch and remove it

• git kill - remove a feature branch
• git rename-branch - rename a branch
• git repo - view the repository homepage

• git append - insert a new branch as a child of the current branch
• git prepend - insert a new branch between the current branch and its parent
• git set-parent - updates a branch's parent

• git town config - display or update your Git Town configuration
• git town version - display the installed version of Git Town

See the installation and configuration instructions.

The Git Town website provides documentation for Git Town users. git town help [command] shows help on the CLI.

Found a bug or have an idea for a new feature? Open an issue or send a pull request! Our developer documentation helps you get started.