From d77d636b4c08f45d0784f3f9f901fbef754ae762 Mon Sep 17 00:00:00 2001
From: Ivan Eisenberg <ivan.eisenberg@gmail.com>
Date: Thu, 13 Sep 2018 14:41:26 -0500
Subject: [PATCH] git-flow: add "gflfp" alias for feature publish (#6350)

- Add `gflfp` as an alias for `git flow feature publish`
- Update README.md documentation
---
 plugins/git-flow/README.md           | 35 ++++++++++++++--------------
 plugins/git-flow/git-flow.plugin.zsh |  1 +
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/plugins/git-flow/README.md b/plugins/git-flow/README.md
index f37f418db..5d8049e3b 100644
--- a/plugins/git-flow/README.md
+++ b/plugins/git-flow/README.md
@@ -10,22 +10,23 @@ plugins=(... git-flow)
 
 ## Aliases
 
-More information about `git-flow` commands: 
+More information about `git-flow` commands:
 https://github.com/nvie/gitflow/wiki/Command-Line-Arguments
 
-| Alias   | Command                   | Description                            |
-|---------|---------------------------|----------------------------------------|
-| `gfl`   | `git flow`                | Git-Flow command                       |
-| `gfli`  | `git flow init`           | Initialize git-flow repository         |
-| `gcd`   | `git checkout develop`    | Check out develop branch               |
-| `gch`   | `git checkout hotfix`     | Check out hotfix branch                |
-| `gcr`   | `git checkout release`    | Check out release branch               |
-| `gflf`  | `git flow feature`        | List existing feature branches         |
-| `gflh`  | `git flow hotfix`         | List existing hotfix branches          |
-| `gflr`  | `git flow release`        | List existing release branches         |
-| `gflfs` | `git flow feature start`  | Start a new feature: `gflfs <name>`    |
-| `gflhs` | `git flow hotfix start`   | Start a new hotfix: `gflhs <version>`  |
-| `gflrs` | `git flow release start`  | Start a new release: `gflrs <version>` |
-| `gflff` | `git flow feature finish` | Finish feature: `gflff <name>`         |
-| `gflhf` | `git flow hotfix finish`  | Finish hotfix: `gflhf <version>`       |
-| `gflrf` | `git flow release finish` | Finish release: `gflrf <version>`      |
+| Alias   | Command                    | Description                            |
+|---------|----------------------------|----------------------------------------|
+| `gfl`   | `git flow`                 | Git-Flow command                       |
+| `gfli`  | `git flow init`            | Initialize git-flow repository         |
+| `gcd`   | `git checkout develop`     | Check out develop branch               |
+| `gch`   | `git checkout hotfix`      | Check out hotfix branch                |
+| `gcr`   | `git checkout release`     | Check out release branch               |
+| `gflf`  | `git flow feature`         | List existing feature branches         |
+| `gflh`  | `git flow hotfix`          | List existing hotfix branches          |
+| `gflr`  | `git flow release`         | List existing release branches         |
+| `gflfs` | `git flow feature start`   | Start a new feature: `gflfs <name>`    |
+| `gflhs` | `git flow hotfix start`    | Start a new hotfix: `gflhs <version>`  |
+| `gflrs` | `git flow release start`   | Start a new release: `gflrs <version>` |
+| `gflff` | `git flow feature finish`  | Finish feature: `gflff <name>`         |
+| `gflfp` | `git flow feature publish` | Publish feature: `gflfp <name>`        |
+| `gflhf` | `git flow hotfix finish`   | Finish hotfix: `gflhf <version>`       |
+| `gflrf` | `git flow release finish`  | Finish release: `gflrf <version>`      |
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 5f5e4aa73..eab969d8a 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -33,6 +33,7 @@ alias gflfs='git flow feature start'
 alias gflhs='git flow hotfix start'
 alias gflrs='git flow release start'
 alias gflff='git flow feature finish'
+alias gflfp='git flow feature publish'
 alias gflhf='git flow hotfix finish'
 alias gflrf='git flow release finish'
 alias gflfp='git flow feature publish'