gitalias: do not assume master
as universal default branch
Summary: Since around 2020, `main` has gained traction but not everyone has followed suit, so move master-tracking commands to make way for disambig command. This will let me select my own default primary branch that is neither main nor master. Signed-off-by: Yongmin Hong <revi@omglol.email> Test Plan: `sh deploy.sh` then try `git com`. Reviewers: O1 revi & automations, revi Reviewed By: O1 revi & automations, revi Differential Revision: https://issuetracker.revi.xyz/D68
This commit is contained in:
parent
30c04e1cb6
commit
fbd4a63e03
1 changed files with 13 additions and 7 deletions
20
.gitaliases
20
.gitaliases
|
@ -6,21 +6,27 @@
|
|||
fa = fetch --all
|
||||
graph = log --pretty=format:\"%h %s\" --graph
|
||||
fo = fetch origin
|
||||
usync = rebase upstream/master
|
||||
usyncm = rebase upstream/main
|
||||
osync = rebase origin/master
|
||||
# some project uses `master` and some uses `main` for the default.
|
||||
# since their first two letters are both ma, use the last char.
|
||||
usync = !echo 'ERROR: use usyncr for master, and usyncn for main.'
|
||||
usyncr = rebase upstream/master
|
||||
usyncn = rebase upstream/main
|
||||
osync = !echo 'ERROR: use osyncr for master, and osyncm for main.'
|
||||
osyncr = rebase origin/master
|
||||
osyncm = rebase origin/main
|
||||
aal = add *
|
||||
po = push origin master
|
||||
pom = push origin main
|
||||
po= !echo 'ERROR: use por for master, and pon for main.'
|
||||
por = push origin master
|
||||
pon = push origin main
|
||||
amend = commit --amend -s
|
||||
cmt = commit -S -s
|
||||
amends = commit --amend -S -s
|
||||
acmt = commit -a -S -s
|
||||
acm = commit -a -s
|
||||
fup = fetch upstream
|
||||
com = checkout master
|
||||
comm = checkout main
|
||||
com = !echo 'ERROR: use cor for master, and con for main.'
|
||||
comr = checkout master
|
||||
comn = checkout main
|
||||
por = push origin
|
||||
cob = checkout -b
|
||||
# below are non-git command, signified via `!` in the comment
|
||||
|
|
Loading…
Reference in a new issue