From 401b2252d3e51fdcae5b5d87fb82335bd07351ff Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 21 Apr 2017 21:07:10 +0300
Subject: [PATCH] - Split tracking git alias from pull-force.
---
.gitconfig | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitconfig b/.gitconfig
index 9369931..94109d6 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,11 +6,11 @@
empty-commit = commit --allow-empty
exec = "!exec "
ff = merge --no-edit --ff-only master
- forget = reset HEAD~1
+ forget = reset HEAD^
merg = merge --no-edit
posh = push --set-upstream origin HEAD
pul = pull --progress
- pull-force = !git fetch && git reset --hard "$(git rev-parse --abbrev-ref --symbolic-full-name @{u})"
+ pull-force = !git fetch && git reset --hard "$(git tracking)"
push-force = push --force-with-lease
root = rev-parse --show-toplevel
serve-git = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
@@ -18,6 +18,7 @@
staash = stash --all
stat = status --short --branch
tag-version = !git tag -f "v$(cat VERSION)"
+ tracking = rev-parse --abbrev-ref --symbolic-full-name @{upstream}
trigger = !git commit --allow-empty --no-edit --amend && git push --force-with-lease
[color]
grep = true
--
GitLab