dotfiles

commit 78f808789ce9aac97ff5fa23200ac9f4c7806b19
parent 0b63917a1cde92c19aa5048e06b32af2ca8e9f2e
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Tue, 30 Oct 2018 23:56:17 +0100

Fixed git aliases

Diffstat:
M
git/gitconfig
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git/gitconfig b/git/gitconfig
@@ -32,12 +32,13 @@
     diffs = "diff --staged"
     changes = diff --summary --stat
     mergetest = merge --no-commit --no-f
+    mergen = --no-ff
     delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
     p = push
     pp = pull
     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"
+    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}'"
     open = "!open $(git home)"
     dad = "!curl https://icanhazdadjoke.com/ && git add"