Skip to content

Instantly share code, notes, and snippets.

@erikghonyan
Last active July 19, 2023 08:03
Show Gist options
  • Save erikghonyan/c2a8ddc5dffa71a9c98a28c23edef622 to your computer and use it in GitHub Desktop.
Save erikghonyan/c2a8ddc5dffa71a9c98a28c23edef622 to your computer and use it in GitHub Desktop.
[alias]
g = !git
st = status
l = log
lo = log --oneline
d = diff
dif = diff
co = checkout
ours = checkout --ours
theirs = checkout --theirs
com = checkout main
m = !git checkout main && git pull --rebase
au = add -u
c = commit
cm = commit -m
temp = commit -m temp
reword = commit --amend
amend = commit --amend --no-edit
damend = !git diff && git commit --amend --no-edit
fixup = commit --fixup
reset-author = commit --amend --no-edit --reset-author
root = merge-base HEAD upstream/main
rb = rebase
rbi = rebase -i
rbh = rebase HEAD
rbhi = rebase -i HEAD
rbm = rebase main
rbmi = rebase -i main
rbu = rebase upstream/main
rbui = rebase -i upstream/main
rbc = !GIT_EDITOR=true git rebase --continue
rba = rebase --abort
rbs = rebase --skip
r = reset
rh = reset --hard
rhh = reset --hard HEAD
rhu = reset --hard upstream/main
uncommit = reset --soft HEAD^
fo = fetch --prune origin
fu = fetch --prune upstream
fa = fetch --prune --all
furb = !git fetch --prune upstream && git rebase upstream/main
fum = fetch --prune upstream main:main
po = push origin
p = !git push origin $(git rev-parse --abbrev-ref HEAD)
pf = !git push -f origin $(git rev-parse --abbrev-ref HEAD)
su = submodule update --init --recursive
no-push = remote set-url --push upstream no_push
cp = cherry-pick
cpnc = cherry-pick --no-commit
br = branch
brd = branch -d
brD = branch -D
pr = !gh co
ship = !gh ship $USER:$(git branch --show-current | tr -d '\n')
branch-name = !git branch --show-current | tr -d '\n'
copy-branch-name = !git branch --show-current | tr -d '\n' | pbcopy
head-sha1 = !git rev-parse HEAD | tr -d '\n' | pbcopy
tree = !gitk --all &
kraken = !"open -a /Applications/GitKraken.app/Contents/MacOS/GitKraken"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment