opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer "main" to "master"

Browse source 
See
1e7fa50da0.

> This commit introduces `git-master-to-main-wrapper`, which seamlessly
prefers `main` to `master` but works fine with repos that do use
a `master` branch.
This commit is contained in:
Oliver Davies 2020-07-19 21:58:21 +01:00
parent 2e8c717036
commit 0f797c6ffe
4 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tag-git/gitconfig
View file

@ -15,7 +15,7 @@
dup = !git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -
fixup = commit --fixup
issues = !hub browse -- issues
mup = !git checkout master && git fetch origin && echo && git sl master..origin/master && echo && git pull --quiet && git checkout -
mup = !git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -
nah = !git reset --hard && git clean -fd
no-ff = merge --no-ff
pl = pull
@ -26,10 +26,10 @@
rdup = !git dup && git rebase develop
remotes = remote -v
repush = !git pull --rebase && git push
rmup = !git mup && git rebase master
rmup = !git mup && git master-to-main-wrapper rebase %BRANCH%
ri = rebase --interactive
rid = !git rebase -i $(git merge-base develop HEAD)
rim = !git rebase -i $(git merge-base master HEAD)
rim = !git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)
riu = !git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
sl = log --oneline --decorate -20
sla = log --oneline --decorate --graph --all -20