michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-15 06:32:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge

Browse Source
This commit is contained in:
Michael Housh
2021-12-12 13:42:49 -05:00
parent 764487fcfe
commit e282a1c4d1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zsh/.config/zsh/zsh-aliases
View File

@@ -1,10 +1,7 @@
# configure aliases # configure aliases
#alias zshconfig="$ZDOTDIR" #alias zshconfig="$ZDOTDIR"
<<<<<<< HEAD
=======
alias zdots() { nvim "$ZDOTDIR" } alias zdots() { nvim "$ZDOTDIR" }
alias dots() { nvim ~/.dotfiles } alias dots() { nvim ~/.dotfiles }
>>>>>>> master
alias mkcd() { mkdir $1 && cd $1 } alias mkcd() { mkdir $1 && cd $1 }
alias l() { ls -lah "$@" } alias l() { ls -lah "$@" }
@@ -15,11 +12,8 @@ alias vim() { nvim "$@" }
# git # git
alias g() { git "$@" } alias g() { git "$@" }
alias ga() { git add . } alias ga() { git add . }
<<<<<<< HEAD
=======
alias gcb() { git checkout -b "$@" } alias gcb() { git checkout -b "$@" }
alias gco() { git checkout "$@" } alias gco() { git checkout "$@" }
>>>>>>> master
alias gma() { git add . && git commit -m "$1" } alias gma() { git add . && git commit -m "$1" }
alias gs() { git status } alias gs() { git status }