summary refs log tree commit diff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/git/config5
1 files changed, 5 insertions, 0 deletions
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