From b2a6de7ebcb79359cafe23dddfb1820477c2280c Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Thu, 15 Aug 2024 09:11:45 +0300
Subject: [PATCH] Add git aliases

---
 home/.config/git/config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/home/.config/git/config b/home/.config/git/config
index 3f4d7fe..dde22df 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -1,9 +1,5 @@
 [user]
-{%@@ if profile == "mko-laptop" @@%}
 email = marko.korhonen@rossum.fi
-{%@@ else @@%}
-email = marko@korhonen.cc
-{%@@ endif @@%}
 name = Marko Korhonen
 signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0
 
@@ -38,6 +34,10 @@ mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 feat
 upstream = !git push -u origin HEAD
 sync = !git pull && git push
 recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG
+pull-merge = pull --no-rebase --no-ff --no-edit
+log-merge = log -i --grep=merge --pretty=oneline
+log-fp = log --first-parent --pretty=oneline
+ll = log --pretty=oneline
 
 [color]
 pager = no