diff --git a/.gitconfig b/.gitconfig index 085863c4ebd2f0752c54b5f2a6cbc43469fdc0dc..41340d7273a8a64753d43ddc1e30ff7cc157c26e 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