Skip to content

Commit

Permalink
Add aliases from OhMyZsh git plugin to my project
Browse files Browse the repository at this point in the history
Tanks to Oh My Zsh (@ohmyzsh) contributors

# https://github.com/ohmyzsh/ohmyzsh/blob/93c837fec8e9fe61509b9dff9e909e84f7ebe32d/LICENSE.txt

Copyright (c) 2009-2020
Robby Russell and
[contributors](https://github.com/ohmyzsh/ohmyzsh/contributors)

 @robbyrussell
 @mcornella
 @ncanceill
 @yleo77
 @simlegate
 @SimenB
 @pielgrzym
 @svnlto
 @soluwalana
 @ouuan
 @matjack1
 @jmacdonald
 @JaKXz
 @hakanensari
 @ferrerluis
 @eddorre
 @SomeDer
 @felipeguilhermefs
 @zhiyelee
 @yagonobre
 @adispring
 @volcov
 @TvrtkoM
 @tushart91
 @teameh
 @tbuehl
 @surma
 @stevschmid
 @sc68cal
 @sachin21
 @wabisabit
 @rmstyrczula
 @ArnaudRinquin
 @neeasade
 @mgalgs
 @hakuseki
 @michaljuris
 @VannTen
 @Mehonoshin
 @mchaisse
 @okuramasafumi
 @marcusmueller
 @mahmoudhossam
 @larumbe
 @kkalavantavanich
 @ujwaldhakal
 @jchannon
 @joelwallis
 @jmatth
 @jeffersfp
 @jyrivallan
 @grongor
 @FiloSottile
 @gkaklas
 @blueyed
 @brainplot
 @GantMan
 @gsemet
 @emanuelez
 @dskecse
 @drnic
 @bittner
 @divineforest
 @dimh
 @chuanjin
 @wanbok
 @chmelevskij
 @cmalard
 @abstractj
 @Poyoman39
 @bdubertret
 @bmcorser
 @bartektartanus
 @baaig
 @ayushs
 @ameltonyan
 @arnihermann
 @apjanke
 @onemouth
 @allister-lundberg
 @allanlewis
 @ajhenriques
 @PrestanceDesign
 @adam2k
 @jjanvier

Signed-off-by: Benjamin Vincent (Luxcium) <luxcium@neb401.com>
  • Loading branch information
Luxcium committed Sep 20, 2020
1 parent 75f1c10 commit 7a9f0e1
Showing 1 changed file with 65 additions and 10 deletions.
75 changes: 65 additions & 10 deletions aliases.d/000-git.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
##################
## GIT / GITHUB ##
##################
alias testtest="echo test test"

echo '/home/luxcium/ahmyzsh/aliases.d/000-git.sh loaded'

alias check='git checkout master'
alias add='git add -u --renormalize -v .'
Expand All @@ -15,11 +12,69 @@ alias gs='git fetch -t; git gc; git status'
alias pull='git pull --all -t'
alias fetch='git fetch -t; git fetch --all -v -u'
alias lb='git branch -a -v --color | cat'
alias firstcommit='git add .; git commit -am "Scientia is lux principium✨™"; git push -u origin master'
alias pullmaster='git checkout master; git pull -S --stat --progress --signoff --tags origin master'
alias pullnext='hub pull-request && hub merge' #git pull -S --stat --progress --signoff --squash --tags origin next/version'
alias commitpullnext='git commit -am "merging from origin next/version into local master"; push'
alias deletenext='git branch -d next/version; git push origin --delete next/version; lb'
alias newnext='git checkout -b next/version; push; git branch --set-upstream-to=origin/next/version next/version'
alias gitcleannext='rm -rf ./dist; rm -rf ./build; rm -f ./package.1.json; git add .; git commit -m "getting ready to build next/version"; push'
alias nextcycle='push; pullmaster; pullnext; commitpullnext; deletenext; newnext; gitcleannext; lb'
# alias firstcommit='git add .; git commit -am "Scientia is lux principium✨™"; git push -u origin master'
# alias pullnext='hub pull-request && hub merge' #git pull -S --stat --progress --signoff --squash --tags origin next/version'
# alias commitpullnext='git commit -am "merging from origin next/version into local master"; push'
# alias deletenext='git branch -d next/version; git push origin --delete next/version; lb'
# alias newnext='git checkout -b next/version; push; git branch --set-upstream-to=origin/next/version next/version'
# alias gitcleannext='rm -rf ./dist; rm -rf ./build; rm -f ./package.1.json; git add .; git commit -m "getting ready to build next/version"; push'
# alias nextcycle='push; pullmaster; pullnext; commitpullnext; deletenext; newnext; gitcleannext; lb'

# https://github.com/ohmyzsh/ohmyzsh/blob/93c837fec8e9fe61509b9dff9e909e84f7ebe32d/LICENSE.txt
# 106 contri
alias g='git'

alias ga='git add'
alias gaa='git add --all'
alias gapa='git add --patch'
alias gau='git add --update'
alias gav='git add --verbose'
alias gap='git apply'
alias gapt='git apply --3way'

alias gb='git branch'
alias gba='git branch -a'
alias gbd='git branch -d'
alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|development|develop|devel|dev)\s*$)" | command xargs -n 1 git branch -d'
alias gbD='git branch -D'
alias gbl='git blame -b -w'
alias gbnm='git branch --no-merged'
alias gbr='git branch --remote'
alias gbs='git bisect'
alias gbsb='git bisect bad'
alias gbsg='git bisect good'
alias gbsr='git bisect reset'
alias gbss='git bisect start'

alias gc='git commit -v'
alias gc!='git commit -v --amend'
alias gcn!='git commit -v --no-edit --amend'
alias gca='git commit -v -a'
alias gca!='git commit -v -a --amend'
alias gcan!='git commit -v -a --no-edit --amend'
alias gcans!='git commit -v -a -s --no-edit --amend'
alias gcam='git commit -a -m'
alias gcsm='git commit -s -m'
alias gcb='git checkout -b'
alias gcf='git config --list'
alias gcl='git clone --recurse-submodules'
alias gclean='git clean -id'
alias gpristine='git reset --hard && git clean -dffx'
alias gcm='git checkout $(git_main_branch)'
alias gcd='git checkout develop'
alias gcmsg='git commit -m'
alias gco='git checkout'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'
alias gcpa='git cherry-pick --abort'
alias gcpc='git cherry-pick --continue'
alias gcs='git commit -S'

alias gd='git diff'
alias gdca='git diff --cached'
alias gdcw='git diff --cached --word-diff'
alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
alias gds='git diff --staged'
alias gdt='git diff-tree --no-commit-id --name-only -r'
alias gdw='git diff --word-diff'

0 comments on commit 7a9f0e1

Please sign in to comment.