From 0dec25370a27d0368c733028384b31c251a0d835 Mon Sep 17 00:00:00 2001
From: Simon <mastersimon@users.noreply.github.com>
Date: Thu, 23 Feb 2017 10:26:13 +0100
Subject: [PATCH] Add new commands

Run `gcdmc` or `gcmmc` in order to merge the latest remote [develop|master] state into the current branch. In more detail:
- checkout [develop|master] branch
- pull [develop|master] branch
- checkout latest branch
- merge [develop|master] branch to latest branch
---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 34942d38..0a0fa184 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -82,6 +82,8 @@ alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'
 alias gcpc='git cherry-pick --continue'
 alias gcs='git commit -S'
+alias gcdmc='git checkout develop && git pull && git checkout - && git merge develop'
+alias gcmmc='git checkout master && git pull && git checkout - && git merge master'
 
 alias gd='git diff'
 alias gdca='git diff --cached'