diff --git a/aliases b/aliases index 8bed74b..2a7d22a 100644 --- a/aliases +++ b/aliases @@ -33,15 +33,18 @@ alias k="kuso" alias g="git" alias gl="git pull" alias gp="git push" +alias push="git_push" +alias pull="git_pull" alias kff="kernel_find_file" alias ls='ls --color' -alias ll='ls -l' -alias la='ls -lA' +alias ll='ls -lh' +alias la='ls -lhA' alias sl=ls alias ...='cd ../..' +alias ....='cd ../../..' alias -- -='cd -' alias _="sudo" diff --git a/lib/git.zsh b/lib/git.zsh index 8bdf4ea..09ff89b 100755 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -127,6 +127,18 @@ function git_compare_version() { echo 1 } +function git_current_branch() { + git branch |grep "*"|cut -d ' ' -f 2 +} + +function git_push() { + git push origin `git_current_branch` +} + +function git_pull() { + git pull origin `git_current_branch` +} + #this is unlikely to change so make it all statically assigned POST_1_7_2_GIT=$(git_compare_version "1.7.2") #clean up the namespace slightly by removing the checker function