dotfiles

commit 3aa458102cfacc2d17990ce30f002db913d1e718
parent 88f9ffb69b250038b8add872f6ee885ed95544fa
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Mon, 10 Dec 2018 13:46:42 +0100

Git aliases


Former-commit-id: 5c3d35f43b39e187097d0c890c223a57d46a133a
Diffstat:
M
git/gitconfig
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git/gitconfig b/git/gitconfig
@@ -37,8 +37,9 @@
     mergeno = merge --no-ff
     delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
     p = push
-    pp = pull --ff-only
     pushf = push --force-with-lease
+    pff = pull --ff-only
+    pnf = pull --no-ff
     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"
     home = "!git remote show origin | awk -F ': ' '/Fetch/ {print $2}'"