Skip to content
Snippets Groups Projects
Commit 401b2252 authored by nimrod's avatar nimrod
Browse files

- Split tracking git alias from pull-force.

parent a1e556a1
No related branches found
No related tags found
No related merge requests found
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
empty-commit = commit --allow-empty empty-commit = commit --allow-empty
exec = "!exec " exec = "!exec "
ff = merge --no-edit --ff-only master ff = merge --no-edit --ff-only master
forget = reset HEAD~1 forget = reset HEAD^
merg = merge --no-edit merg = merge --no-edit
posh = push --set-upstream origin HEAD posh = push --set-upstream origin HEAD
pul = pull --progress 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 push-force = push --force-with-lease
root = rev-parse --show-toplevel root = rev-parse --show-toplevel
serve-git = daemon --reuseaddr --verbose --base-path=. --export-all ./.git serve-git = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
staash = stash --all staash = stash --all
stat = status --short --branch stat = status --short --branch
tag-version = !git tag -f "v$(cat VERSION)" 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 trigger = !git commit --allow-empty --no-edit --amend && git push --force-with-lease
[color] [color]
grep = true grep = true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment