Commands

Run git town for an overview of all Git Town commands and git town help <command> for help with individual commands.

Basic workflow

git town hack - create a new feature branch
git town sync - update the current branch with all ongoing changes
git town switch - switch between branches visually
git town propose - propose to ship a branch

Dealing with errors

git town continue - continue after you resolved the merge conflict
git town skip - when syncing all branches, ignore the current branch and continue with the next one
git town status - display available commands
git town undo - undo the last completed Git Town command

Stacked changes

git town append - create a new feature branch as a child
git town detach - move a branch out of a stack
git town diff-parent - show the changes committed to a branch
git town merge - merges the current branch with its parent
git town prepend - create a new feature branch between the current branch and its parent
git town set-parent - change the parent of a feature branch
git town swap - swap the position of this branch with its parent

Limit branch syncing

git town contribute - stop syncing some feature branches with their parents
git town observe - stop syncing your contributions to some feature branches
git town park - suspend syncing some of your feature branches altogether
git town prototype - sync but don’t push a local feature branch

Git Town setup

git town completion - generate completion scripts for Bash, zsh, fish & PowerShell.
git town config - display or update your Git Town configuration
git town config setup - setup assistant
git town offline - enable/disable offline mode

Additional commands

git town branch - display the local branch hierarchy and types
git town compress - squash all commits on a branch branches down to a single commit
git town delete - delete a feature branch
git town help - help about any command
git town rename - rename a branch
git town repo - view the Git repository in the browser
git town ship - deliver a completed feature branch