From ffda6911a152959f99ea0058e0c14c6ea87f46ec Mon Sep 17 00:00:00 2001
From: Robert Günzler <r@gnzler.io>
Date: Fri, 10 Apr 2020 14:13:57 +0200
Subject: git: misc stuff

* default to rebase on pull
* add amend alias
* add fuzzy branch using fzfez
---
 .config/git/config | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.config/git')

diff --git a/.config/git/config b/.config/git/config
index afc72bb..09c5372 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -79,6 +79,8 @@
     rebase-onto = !bash -c 'git rebase --onto ${1} `git oldest-ancestor ${2} ${3}` ${3}' -
     find-by-subject = "!f() { set -ex; s=`git log -1 --format=%s ${1}`; git --no-pager log -1 --grep=\"^${s}$\" --no-merges ${2}; }; f"
     tig = !tig
+    amend = commit --amend
+    fbr = !fzfez git-branches
 
 
 [apply]
@@ -117,6 +119,9 @@
 [fetch]
     prune = true
 
+[pull]
+    rebase = true
+
 [grep]
     lineNumber = true
 
-- 
cgit 1.4.1