Yongmin Hong
fed68e7597
Summary: - `fpush` `--force-with-lease` for safer `--force` - Quick upstream sync with `gon` (main) or `gor` (master) - `spop` for `stash pop` - `sshow` for `show --show-signature` Signed-off-by: Yongmin Hong <revi@omglol.email> Test Plan: try the commands. Reviewers: O1 revi & automations, revi Reviewed By: O1 revi & automations, revi Differential Revision: https://issuetracker.revi.xyz/D354
62 lines
1.7 KiB
Text
62 lines
1.7 KiB
Text
# Copyright (C) 2017 Hong Yongmin <https://revi.xyz>
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
[alias]
|
|
# some project uses `master` and some uses `main` for the default.
|
|
# since their first two letters are both ma, use the last char
|
|
# which is either `r` for master or `n` for main.
|
|
# a-d
|
|
# a-l
|
|
# a-p
|
|
# a-w
|
|
aal = add *
|
|
acm = commit -a -s
|
|
amend = commit --amend
|
|
amends = commit --amend -s
|
|
amendss = commit --amend -S -s
|
|
# arcd
|
|
# arcl
|
|
# arcp
|
|
# arcw
|
|
br = branch -v
|
|
brd = branch -d
|
|
brD = branch -D
|
|
cm = commit -s
|
|
cmt = commit -S -s
|
|
co = checkout
|
|
cob = checkout -b
|
|
com = !echo 'ERROR: use cor for master, and con for main.'
|
|
comn = checkout main
|
|
comr = checkout master
|
|
count = count-objects -vH
|
|
diffs = diff --staged
|
|
fa = fetch --all
|
|
fo = fetch origin
|
|
fpush = push --force-with-lease
|
|
fup = fetch upstream
|
|
gon = !git fup && git comn && git usyncn
|
|
gor = !git fup && git comr && git usyncr
|
|
graph = log --pretty=format:\"%h %s\" --graph
|
|
osync = !echo 'ERROR: use osyncr for master, and osyncm for main.'
|
|
osyncn = rebase origin/main
|
|
osyncr = rebase origin/master
|
|
po= !echo 'ERROR: use por for master, and pon for main.'
|
|
pon = push origin main
|
|
por = push origin master
|
|
prod = !git checkout prod && git rebase origin/master && git push origin prod && git checkout master
|
|
spop = stash pop
|
|
sshow = show --show-signature
|
|
st = status
|
|
staash = stash -a
|
|
usync = !echo 'ERROR: use usyncr for master, and usyncn for main.'
|
|
usyncn = rebase upstream/main
|
|
usyncr = rebase upstream/master
|
|
# below are non-git command, signified via `!` in the comment
|
|
# https://issuetracker.revi.xyz/u/gitalias
|
|
a-d = !arc diff
|
|
arcd = !arc diff
|
|
a-l = !arc land
|
|
arcl = !arc land
|
|
a-p = !arc patch
|
|
arcp = !arc patch
|
|
a-w = !arc work
|
|
arcw = !arc work
|