dotfiles

My personal shell configs and stuff
git clone git://git.alex.balgavy.eu/dotfiles.git
Log | Files | Refs | Submodules | README | LICENSE
commit 6e36eedfc5db33c2db448ffd5d0a51a766eda36a
parent a790f3b5449eaca4c31f2b4becc7bf1071fe5f5c
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Thu,  8 Nov 2018 18:59:23 +0100

Changed git pull alias to ff only

Diffstat:

Mgit/gitconfig | 2+-


1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/gitconfig b/git/gitconfig
@@ -35,7 +35,7 @@
     mergeno = merge --no-ff
     delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
     p = push
-    pp = pull
+    pp = pull --ff-only
     pushf = push --force-with-lease
     fuckitall = reset --hard HEAD
     up-sub = "!git submodule foreach 'git fetch origin --tags; git checkout master; git pull' && git add . && git commit -m 'Updated submodules';git submodule update --recursive --checkout --force"