diff --git a/.config/git/config b/.config/git/config index 2d54b4369f1ca35201d94e13bad4ad8fe12a4f07..ea261552b35a4735fc9731e464b1e6722db417d5 100644 --- a/.config/git/config +++ b/.config/git/config @@ -19,6 +19,8 @@ Pull = pull --progress --ff --tags pull-force = !git fetch && git reset --hard "$(git tracking)" pushes = !git remote | xargs -n1 git push + remaster = !git fetch --all && git autorebase origin/master + rerebase = !git autorebase "$(git tracking)" 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 http.server 8080 @@ -28,6 +30,7 @@ staaash = stash push --all --include-untracked stat = status --short --branch tag-version = !git tag --annotate --force --message "v$(cat VERSION)" "v$(cat VERSION)" + temptree = !git worktree add "$(mktemp -d)" tracking = rev-parse --abbrev-ref --symbolic-full-name @{upstream} trigger = !git commit --allow-empty --no-edit --amend && git pushes --force-with-lease [color]