From 84e39885c404b69f9de047a13eb08bbe54bcf95e Mon Sep 17 00:00:00 2001 From: Josh Powell Date: Thu, 11 Jul 2019 19:38:28 -0400 Subject: [PATCH 1/2] First pass at git-town aliases --- plugins/git-town/README.md | 22 ++++++++++++++++++++++ plugins/git-town/git-town.plugin.zsh | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 plugins/git-town/README.md create mode 100644 plugins/git-town/git-town.plugin.zsh diff --git a/plugins/git-town/README.md b/plugins/git-town/README.md new file mode 100644 index 000000000..33c166f78 --- /dev/null +++ b/plugins/git-town/README.md @@ -0,0 +1,22 @@ +# Git-Town plugin + +This plugin adds completion and aliases for the `git-town` command. More information +at https://www.git-town.com. + +Enable git-town plugin in your zshrc file: +``` +plugins=(... git-town) +``` + +## Aliases + +More information about `git-town` commands: +https://github.com/Originate/git-town#commands + +| Alias | Command | Description | +|---------|----------------------------|----------------------------------------| +| `gt` | `git town` | Git-Town command | +| `gth` | `git town hack` | New feature branch off main branch | +| `gtsy` | `git town sync` | Updates current branch w/ all changes | +| `gtnpr` | `git town new-pull-request`| Create a new pull request | +| `gtsh` | `git town ship` | Delivers feature branch and removes it | diff --git a/plugins/git-town/git-town.plugin.zsh b/plugins/git-town/git-town.plugin.zsh new file mode 100644 index 000000000..ebf4fc577 --- /dev/null +++ b/plugins/git-town/git-town.plugin.zsh @@ -0,0 +1,19 @@ +#!zsh +# +# Installation +# ------------ +# +# WIP + +#Alias +| `gt` | `git town` | Git-Town command | +| `gth` | `git town hack` | New feature branch off main branch | +| `gtsy` | `git town sync` | Updates current branch w/ all changes | +| `gtnpr` | `git town new-pull-request`| Create a new pull request | +| `gtsh` | `git town ship` | Delivers feature branch and removes it | + +alias gt='git town' +alias gth='git town hack' +alias gtsy='git town sync' +alias gtnpr='git town new-pull-request' +alias gtsh='git town ship' From ce84456118b03efb43298fd2500a7606f35211d1 Mon Sep 17 00:00:00 2001 From: Josh Powell Date: Wed, 24 Jul 2019 09:49:44 -0400 Subject: [PATCH 2/2] Adds popular abort / continue --- plugins/git-town/README.md | 2 ++ plugins/git-town/git-town.plugin.zsh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/plugins/git-town/README.md b/plugins/git-town/README.md index 33c166f78..5fb23ebab 100644 --- a/plugins/git-town/README.md +++ b/plugins/git-town/README.md @@ -16,6 +16,8 @@ https://github.com/Originate/git-town#commands | Alias | Command | Description | |---------|----------------------------|----------------------------------------| | `gt` | `git town` | Git-Town command | +| `gtab` | `git town abort` | Aborts the last run git-town command | +| `gtc` | `git town continue` | Restarts last after resolved conflict | | `gth` | `git town hack` | New feature branch off main branch | | `gtsy` | `git town sync` | Updates current branch w/ all changes | | `gtnpr` | `git town new-pull-request`| Create a new pull request | diff --git a/plugins/git-town/git-town.plugin.zsh b/plugins/git-town/git-town.plugin.zsh index ebf4fc577..abb1bb5fe 100644 --- a/plugins/git-town/git-town.plugin.zsh +++ b/plugins/git-town/git-town.plugin.zsh @@ -7,12 +7,16 @@ #Alias | `gt` | `git town` | Git-Town command | +| `gtab` | `git town abort` | Aborts the last run git-town command | +| `gtc` | `git town continue` | Restarts last after resolved conflict | | `gth` | `git town hack` | New feature branch off main branch | | `gtsy` | `git town sync` | Updates current branch w/ all changes | | `gtnpr` | `git town new-pull-request`| Create a new pull request | | `gtsh` | `git town ship` | Delivers feature branch and removes it | alias gt='git town' +alias gta='git town abort' +alias gtc='git town continue' alias gth='git town hack' alias gtsy='git town sync' alias gtnpr='git town new-pull-request'