dotfiles

commit 377a8024c3f1f9cfe7371dc4f20547dced19002d
parent 31fe6e18af0ff575cf93b189f8999760304035b5
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Sun, 20 Jan 2019 22:17:49 +0100

More useful git aliases


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

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/git/gitconfig b/git/gitconfig
@@ -6,6 +6,7 @@
     co = checkout
     cob = checkout -b
     f = fetch --all
+    fapr = fetch --all --prune
     b = branch
     br = branch --remote
     bv = branch -vv
@@ -35,8 +36,9 @@
     diffs = "diff --staged"
     changes = diff --summary --stat
     mergetest = merge --no-commit --no-f
+    testmerge = mergetest
     mergeno = merge --no-ff
-    delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
+    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
@@ -47,6 +49,8 @@
     open = "!open $(git home)"
     dad = "!curl https://icanhazdadjoke.com/ && git add"
 
+    la = "!git config -l | grep alias | cut -c 7-"
+
 [merge]
     tool = vimdiff
 [core]