From 39e9b824a622859e758862c8d1ee7acd5677ebdd Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Thu, 1 Oct 2020 13:32:01 +0530
Subject: [PATCH] git: Some improvements to git configuration

Use fast forward only for merge, auto stash when doing rebase and take
care of tags when doing a push.
---
 git/.gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 5435039..90d3421 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,16 +19,21 @@
 [merge]
 	tool = vimdiff3
 	conflictstyle = diff3
+	ff = only
 [mergetool]
 	prompt = false
 [mergetool "vimdiff"]
 	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 	trustExitCode = true
 	keepBackup = false
+[rebase]
+	autoStash = true
 [commit]
 	verbose = true
 [pull]
 	rebase = false
+[push]
+	followTags = true
 [interactive]
 	diffFilter = delta --color-only
 [delta]