X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a8b58654f90e8fc3fa73fe4cd7240c5b03874947..5a2284037037425ef0f62a090902f7797b32400c:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 56ae58f..5c7756c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,7 +3,7 @@
 	email = madduck@madduck.net
 	signingkey = 330c4a75
 [core]
-	pager = cat
+	pager = "less -F"
 [gui]
 	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [alias]
@@ -14,7 +14,7 @@
 	ci = commit -a
 	stat = status
 	files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
-	returnto = "!git add . && git commit -m'stowing away trash' >/dev/null && d=$(date +%Y.%m.%d.%H.%M.%S) && git tag trash/$d && echo tagged unwanted worktree $(git rev-parse --short HEAD) with trash/$d && git reset --hard HEAD^ >/dev/null && git reset --hard"
 [clean]
 	requireForce = true
-
+[branch]
+	autosetupmerge = true