brunofontes/linuxShortcuts
1
0
Fork 0
mirror of https://github.com/brunofontes/linuxShortcuts.git synced 2024-11-23 22:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Small fixes and add a few new alias

Browse Source 
- Fixing vagrant
   From time to time, after running the vagrant command
   path were changed to Vagrant. I fixed it by changing the
   && to ";"

- Added "gmerge"
   It is just a shortcut to merge another branch to the branch
   I am working on. Very usefull if I have to merge it often.
This commit is contained in:
Bruno F. Fontes 2018-10-25 14:30:52 -03:00
parent 958dc79c93
commit 2b6ee0f696
Signed by: brunofontes
GPG Key ID: EE3447CE80048495
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zshrc
View File

@ -102,7 +102,7 @@ alias gch='git checkout'
alias gc='git commit' alias gc='git commit'
alias gs='git status' alias gs='git status'
alias gpull='sshadd; git pull origin $(git_current_branch)' alias gpull='sshadd; git pull origin $(git_current_branch)'
alias gp='sshadd; git gc --auto; git push --all origin; git push --tags' alias gp='sshadd; git gc --auto; git push --all origin; git push --tags origin'
alias glog='git log --graph --oneline --decorate -n 10 --color' alias glog='git log --graph --oneline --decorate -n 10 --color'
alias update='bash ~/Apps/linuxShortcuts/Pacman/updateRepositories.sh' alias update='bash ~/Apps/linuxShortcuts/Pacman/updateRepositories.sh'
alias grep='grep --color=auto' alias grep='grep --color=auto'
@ -114,9 +114,10 @@ alias du='ncdu --color dark --exclude .git'
alias clearLogs='sudo find /var/log -mtime +30 -type f -delete' alias clearLogs='sudo find /var/log -mtime +30 -type f -delete'
alias vzsh='vim ~/.zshrc && source ~/.zshrc' alias vzsh='vim ~/.zshrc && source ~/.zshrc'
alias ssh='sshadd; /usr/bin/ssh' alias ssh='sshadd; /usr/bin/ssh'
alias rm='/usr/bin/rm -I'
function vagrant () { function vagrant () {
builtin cd ~/development/laravelHomestead && /usr/bin/vagrant $* && builtin cd - builtin cd ~/development/laravelHomestead && /usr/bin/vagrant $*; builtin cd -
} }
function mkcd () { mkdir -p "$1" && builtin cd -P -- "$1" } function mkcd () { mkdir -p "$1" && builtin cd -P -- "$1" }
@ -124,6 +125,11 @@ function sshadd() { ssh-add -l > /dev/null || ssh-add }
function le { "$1" | less } function le { "$1" | less }
function cd { echo; builtin cd "$1"; ls --color=tty; echo; echo PWD: "$PWD" } function cd { echo; builtin cd "$1"; ls --color=tty; echo; echo PWD: "$PWD" }
function gmerge()
{
branch=$(git_current_branch); git checkout "$1"; git merge "$branch"; git checkout "$branch"
}
function extract() # Handy Extract Program. function extract() # Handy Extract Program.
{ {
if [ -f $1 ] ; then if [ -f $1 ] ; then
@ -172,3 +178,9 @@ fi
#Bruno - Keep "LESS" content on screen when exit #Bruno - Keep "LESS" content on screen when exit
export LESS="-XFR" export LESS="-XFR"
#Bruno - Gnome keyring
if [ -n "$DESKTOP_SESSION" ];then
eval $(gnome-keyring-daemon --start)
export SSH_AUTH_SOCK
fi