From fabc83c620df635650d939d3c224f788cd0511d4 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 21 Oct 2021 20:46:31 +0300
Subject: [PATCH] Some Git workflow improvements.
- Alias to get the default branch (like master, main, dev).
- Alias to update the default branch from the origin remote.
- Fix the remaster alias (to rebase on the updated default branch).
---
.config/git/config | 4 +++-
Documents/bin/git-newday | 5 -----
2 files changed, 3 insertions(+), 6 deletions(-)
delete mode 100755 Documents/bin/git-newday
diff --git a/.config/git/config b/.config/git/config
index 4dd736f..3c9412f 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 608322b..0000000
--- 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
--
GitLab