Commit f6d49c15 authored by nimrod's avatar nimrod
Browse files

- Split tracking git alias from pull-force.

parent 8f4b1b92
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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