From 9242f19b259f3bce0487f32c15c059f6c135abb0 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@gmail.com>
Date: Thu, 22 Nov 2018 13:39:45 +0100
Subject: [PATCH] better join (PR merge) alias

---
 gitconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gitconfig b/gitconfig
index 71ff9fb..df9ff92 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,6 +8,7 @@
 	conflictstyle = diff3
 [push]
 	default = simple
+	followTags = true
 [core]
 	excludesfile = ~/.config/gitignore
 [gpg]
@@ -17,6 +18,7 @@
 [alias]
 	pf = push --force-with-lease
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
-    ff = merge --ff-only
-    co = checkout
-    jn = merge --no-ff
+	ff = merge --ff-only
+	co = checkout
+	jn = merge --no-ff --log --edit
+