.gitconfig: Add ff and git aliases

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 0581c556b3b00165fe4ccc8f6f969e2a3c94f4c1..f5605cf6e2a23511df7f38b87b24a51fb3a154f9 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -148,6 +148,8 @@
        dump = cat-file -p
        file = cat-file -t
        type = cat-file -t
+       ff = merge --ff-only
+       git = !git
        l1 = log --decorate --oneline
        l5 = log --decorate -5
        ld = log --decorate
@@ -194,6 +196,7 @@
 
 [push]
        default = simple
+       followTags = true
 
 [receive]
        denyNonFastForwards = true