Yongmin Hong
fbd4a63e03
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
36 lines
1.1 KiB
Text
36 lines
1.1 KiB
Text
[alias]
|
|
co = checkout
|
|
cm = commit -s
|
|
st = status
|
|
br = branch -v
|
|
fa = fetch --all
|
|
graph = log --pretty=format:\"%h %s\" --graph
|
|
fo = fetch origin
|
|
# 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= !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 = !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
|
|
# https://issuetracker.revi.xyz/u/gitalias
|
|
arcdiff = !arc diff
|
|
arcpatch = !arc patch
|
|
arcland = !arc land
|