From f77a21270bba8153db77d7e12d1959b30a5247af Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Tue, 19 Apr 2022 13:03:31 +0200
Subject: updated

---
 git/.gitconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'git')

diff --git a/git/.gitconfig b/git/.gitconfig
index 4f97d85..3e3824b 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -11,6 +11,7 @@
 	deploy = "!f() { read -p \"Do you want to push branch $1 to $1/master? [Y/n] \" yn; [ "$yn" == "Y" ] && git push $1{,:master}; }; f"
 	cm = commit -m
 	ra = "!f() { read -p \"Author email: \" email; [ -n \"${email}\" ] && git config user.email ${email} && git commit --amend --reset-author; }; f"
+	merge-to = "!f() { git checkout $1; git merge -; git checkout -; }; f"
 [push]
 	default = simple
 [pull]
-- 
cgit v1.2.3