From c188824853dbc41585b96fb484c0ae15816c5aec Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 18 Mar 2018 13:04:50 +0200
Subject: [PATCH] Fiddling around with Git aliases.
---
.gitconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitconfig b/.gitconfig
index 085863c..41340d7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,13 +14,13 @@
forget = reset HEAD^
merg = merge --no-edit
posh = push --set-upstream origin HEAD
- pul = pull --progress
+ Pull = pull --progress --ff --tags
pull-force = !git fetch && git reset --hard "$(git tracking)"
- push-force = push --force-with-lease
pushes = !git remote | xargs -n1 git push
root = rev-parse --show-toplevel
serve-git = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
serve-http = !git update-server-info && cd .git && python -m SimpleHTTPServer
+ shove = push --force-with-lease
squash = !cd "${GIT_PREFIX:-}" && git commit --squash $(git last-commit)
staash = stash --all
stat = status --short --branch
--
GitLab