From 87308cbce927f57a6700911a6ed6068c73a48419 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Sun, 2 Feb 2020 16:13:51 +0100
Subject: [PATCH] Add git merge merge request on sucess alias

Works for gitlab.com, will merge a MR when the pipeline has finished
running sucessfully.
---
 git/.config/git/config |  2 +-
 git/.config/git/ignore | 74 ++++++++++++++++++++++++++++++++++++++++++
 sh/.config/sh/alias    |  2 ++
 3 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 git/.config/git/ignore

diff --git a/git/.config/git/config b/git/.config/git/config
index 8aa6895..a97220c 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -8,4 +8,4 @@
 	required = true
 [alias]
   ignore = "!gitignore -f"
-  ign = "ignore"
+  pushmerge = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html#merge-when-pipeline-succeeds-alias
diff --git a/git/.config/git/ignore b/git/.config/git/ignore
new file mode 100644
index 0000000..d138a3d
--- /dev/null
+++ b/git/.config/git/ignore
@@ -0,0 +1,74 @@
+
+# Created by https://www.gitignore.io/api/vim,linux,zsh
+# Edit at https://www.gitignore.io/?templates=vim,linux,zsh
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+Sessionx.vim
+
+# Temporary
+.netrwhist
+
+# Auto-generated tag files
+tags
+
+# Persistent undo
+[._]*.un~
+
+# Coc configuration directory
+.vim
+
+### Zsh ###
+# Zsh compiled script + zrecompile backup
+*.zwc
+*.zwc.old
+
+# Zsh completion-optimization dumpfile
+*zcompdump*
+
+# Zsh zcalc history
+.zcalc_history
+
+# A popular plugin manager's files
+._zplugin
+.zplugin_lstupd
+
+# zdharma/zshelldoc tool's files
+zsdoc/data
+
+# robbyrussell/oh-my-zsh/plugins/per-directory-history plugin's files
+# (when set-up to store the history in the local directory)
+.directory_history
+
+# MichaelAquilina/zsh-autoswitch-virtualenv plugin's files
+# (for Zsh plugins using Python)
+.venv
+
+# Zunit tests' output
+/tests/_output/*
+!/tests/_output/.gitkeep
+
+# End of https://www.gitignore.io/api/vim,linux,zsh
diff --git a/sh/.config/sh/alias b/sh/.config/sh/alias
index daf913f..68bbf82 100644
--- a/sh/.config/sh/alias
+++ b/sh/.config/sh/alias
@@ -61,9 +61,11 @@ if exist git; then
 
   alias gf='git fetch'
   alias gl='git pull'
+
   alias gpn='git push --dry-run'
   alias gp='git push'
   alias gpf!='git push --force'
+  alias gpm='git pushmerge'
 
   alias grv='git remote -v'