add git-default-branch

aliases

@@ -19,16 +19,16 @@ alias remote='git remote add'
 alias cherry='git cherry-pick'
 alias pick='git cherry-pick'
 alias submodule='git submodule init && git submodule update'
-alias m="git checkout master"
-alias mp="git checkout master && git pull"
+alias m='git checkout $(git default-branch)'
+alias mp='git checkout $(git default-branch) && git pull'
 alias b="git checkout -b"
 alias ci='git commit'
 alias c="git fuzzy-checkout"
 alias co="git fuzzy-checkout"
 alias c-="git-last-branch"
 alias pr="git push mine && hub pull-request"
 alias uncommit="git log -1 && git reset HEAD^1"
-alias rebase='git rebase -i origin/master'
+alias rebase='git rebase -i origin/$(git default-branch)'
 alias fork='hub fork && hub remote add -p mine $(hub config --get github.user)'
 alias pm='git push mine'
 alias gitx='open -a Fork .'

bin/git-default-branch

@@ -0,0 +1,23 @@
+#!/bin/sh
+set -euo pipefail
+
+# this takes a while with git remote show origin, so cache result
+
+if [ "${1:-}" == "-f" ]; then
+  git config --unset-all defaultbranch.branch
+else
+  branch="$(git config --get defaultbranch.branch || true)"
+fi
+
+if [ ! -z "${branch:-}" ]; then
+  echo $branch
+  exit 0
+fi
+
+# print $NF prints the last item
+# line looks like:
+#   HEAD branch: main
+branch=$(git remote show origin | grep 'HEAD branch' | awk '{print $NF}')
+
+git config --add defaultbranch.branch "$branch"
+echo $branch