diff --git a/.config/git/config b/.config/git/config index 4dd736fd5f4dbd6578f22bccfe3ca022564677b4..3c9412f8db017d99941d514e6908f3f1039356bc 100644 --- a/.config/git/config +++ b/.config/git/config @@ -9,6 +9,7 @@ cdiff = diff --cached cleaan = clean -dX cleaaan = clean -dx + default-branch = !git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f2 dif = diff --color-words empty-commit = commit --allow-empty exec = "!${SHELL:-/bin/sh} -ic " @@ -16,6 +17,7 @@ fixup = !cd "${GIT_PREFIX:-$PWD}" && git commit --fixup $(git last-commit) forget = reset HEAD^ iec = commit --allow-empty --only --message \"Initial empty commit.\" + master = !git fetch --progress --tags "${1:-origin}" "$(git default-branch):$(git default-branch)" merg = merge --no-edit pop = stash pop posh = push --set-upstream origin HEAD @@ -23,7 +25,7 @@ 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 + remaster = !git master && git autorebase "$(git default-branch)" rerebase = !git autorebase "$(git tracking)" retry = !cd "${GIT_PREFIX:-$PWD}" && git amend --no-edit . && git shove root = rev-parse --show-toplevel diff --git a/Documents/bin/git-newday b/Documents/bin/git-newday deleted file mode 100755 index 608322bb50e4bd1c24774d594a709d0be6e2ea00..0000000000000000000000000000000000000000 --- a/Documents/bin/git-newday +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -eu - -git checkout "$(git config init.defaultBranch)" -git pull --progress --ff --tags