From f0769c0f07f4ef28fc5ff5cbd7fb8eaea78a7314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz=20=28admin=29?= <adminjs@schuerz.at>
Date: Sat, 11 Sep 2021 23:34:28 +0200
Subject: [PATCH] update git alias

---
 .gitconfig | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index b3881f9..af89f94 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -35,15 +35,13 @@
         sdiff = !"git diff && git submodule foreach 'git diff'"
         spush = push --recurse-submodules=on-demand
         supdate = submodule update --remote --merge
+        pushup = "!gitbranchname() { git symbolic-ref --short HEAD; }; gitpushupstream() { git push --set-upstream origin `gitbranchname`; }; gitpushupstream"
+        permission-reset = !git diff -p -R --no-ext-diff --no-color | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply
 [merge]
 	conflictstyle = diff3
 	tool = vimdiff
 [mergetool]
 	prompt = false
-
-[alias]
-  pushup = "!gitbranchname() { git symbolic-ref --short HEAD; }; gitpushupstream() { git push --set-upstream origin `gitbranchname`; }; gitpushupstream"
-
 [include]
     path = ~/.gitconfig_local
 [status]