dotfiles

commit 85a05987a8efa1c4063616aa127e07fee8a1afb2
parent fa0cc7f89c69fddac65c9f6f7bd966e9dca7b7a3
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Sun,  5 May 2019 16:56:06 +0200

git: aliases

Former-commit-id: 6c6cdd61e130335a0324ea6b6f068b4f9e648a09
Diffstat:
M
git/gitconfig
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/git/gitconfig b/git/gitconfig
@@ -39,15 +39,16 @@
 
     diffs = "diff --staged"
     changes = diff --summary --stat
-    mergetest = merge --no-commit --no-f
+    mergetest = merge --no-commit
     testmerge = mergetest
-    mergeno = merge --no-ff
+    mno = merge --no-ff
+    mff = merge --ff-only
     delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d && git fetch --all --prune"
     p = push
     pushf = push --force-with-lease
     pff = pull --ff-only
     pnf = pull --no-ff
-    fuckitall = reset --hard HEAD
+    fuckit = reset --hard HEAD
     home = "!git remote get-url origin | sed -E 's|^git@([^:]+):|https://\\1/|'"
     up-sub = "!git submodule foreach git pull; git submodule update --init --recursive -j8"
     open = "!open $(git home)"