From 749373ab605e7bcff29eabc91778fbfdc478d5ce Mon Sep 17 00:00:00 2001 From: Tareq Al-Zubaidi Date: Tue, 5 Jun 2018 10:28:02 +0100 Subject: [PATCH] Add git merge --continue --- plugins/git/git.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index fa0c06500..995c05c02 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -193,6 +193,7 @@ alias gmt='git mergetool --no-prompt' alias gmtvim='git mergetool --no-prompt --tool=vimdiff' alias gmum='git merge upstream/master' alias gma='git merge --abort' +alias gmc='git merge --continue' alias gp='git push' alias gpd='git push --dry-run'