From 9f69638ed045cf7cc71a85ceff2f6fd30c1b5922 Mon Sep 17 00:00:00 2001
From: binaryDiv <lexi@binarydiv.dev>
Date: Tue, 10 Jan 2023 11:27:12 +0100
Subject: [PATCH] gitconfig aliases: Rename undo to uncommit, add push-skip-ci

---
 .gitconfig.inc/common.gitconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitconfig.inc/common.gitconfig b/.gitconfig.inc/common.gitconfig
index 654b63e..41d31a0 100644
--- a/.gitconfig.inc/common.gitconfig
+++ b/.gitconfig.inc/common.gitconfig
@@ -17,6 +17,7 @@
     branch = false
     config = false
     stash = false
+    tag = false
 
 [status]
     submodulesummary = 1
@@ -53,11 +54,14 @@
     # Push a new branch to origin by setting the upstream branch
     push-new = "!f() { CURRENT=$(git branch --show-current); git push -u origin ${1-$CURRENT}; }; f"
 
+    # Push with ci.skip option (probably only works with GitLab)
+    push-skip-ci = push -o ci.skip
+
     # "back to the future": switch to default branch and pull
     bttf = "!f() { DEFAULT=$(git default-branch); git switch ${1-$DEFAULT} && git pull --rebase --prune; }; f"
 
     # Reset HEAD to last commit, but keep files as they are
-    undo = reset HEAD~1 --mixed
+    uncommit = reset HEAD~1 --mixed
 
     # Stash changes, pull and pop stash again
     stash-pull = !git stash && git pull && git stash pop