From: martin f. krafft <madduck@madduck.net>
Date: Tue, 30 Sep 2008 06:29:22 +0000 (+0200)
Subject: set autosetupmerge and remove returnto alias
X-Git-Url: https://git.madduck.net/etc/git.git/commitdiff_plain/ec4e367883db1fad2161e2fe5375d5852c9292f3?hp=04c5852f93c200eeda1018dfcb3657072979f1f8

set autosetupmerge and remove returnto alias
---

diff --git a/.gitconfig b/.gitconfig
index 56ae58f..02efd56 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -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