From 39138280abbf8afdb68ef292ef0858d2e3385606 Mon Sep 17 00:00:00 2001
From: Anton Bobov <abobov@gmail.com>
Date: Thu, 1 Nov 2018 22:19:17 +0500
Subject: Update config

---
 files/.gitconfig | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'files/.gitconfig')

diff --git a/files/.gitconfig b/files/.gitconfig
index b063960..5481ae4 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -22,7 +22,7 @@
 [alias]
     aa = add --all --intent-to-add
     ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' -
-    br = branch
+    br = branch --sort=-committerdate
     c = commit --verbose
     co = checkout
     ci = commit
@@ -61,3 +61,13 @@
     ;clean = unexpand --tabs=4 --first-only
 [gui]
     tabsize = 2
+[pull]
+    rebase = true
+[guitool "meld"]
+    cmd = meld $FILENAME
+    noconsole = yes
+    needsfile = yes
+[guitool "gvim"]
+    cmd = gvim $FILENAME
+    noconsole = yes
+    needsfile = yes
-- 
cgit v1.2.3