diff options
Diffstat (limited to 'external/zsh/aliases/git.zsh')
| -rw-r--r-- | external/zsh/aliases/git.zsh | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/external/zsh/aliases/git.zsh b/external/zsh/aliases/git.zsh deleted file mode 100644 index 47d8c0c..0000000 --- a/external/zsh/aliases/git.zsh +++ /dev/null @@ -1,70 +0,0 @@ -#function git_current_branch() { - #local ref - #ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null) - #local ret=$? - #if [[ $ret != 0 ]]; then - #[[ $ret == 128 ]] && return # no git repo. - #ref=$(command git rev-parse --short HEAD 2> /dev/null) || return - #fi - #echo ${ref#refs/heads/} -#} - -# reset-origin a2_develop -reset-origin() { - if [[ -z $(git status -s) ]]; - then - currentBranch="$(git rev-parse --abbrev-ref HEAD)"; - branch="$1"; - git checkout $branch && - git pull && - git reset --hard origin/production && - git push -u origin $branch -f && - git checkout $currentBranch; - else - echo "Your branch is dirty. Stash or commit changed before proceeding"; - fi -} - -# Git aliases -alias g='git' - -alias ga='git add' -alias gaa='git add --all' - -alias gco='git checkout' -alias gb='git branch' - -alias gc='git commit -v' -alias gcm='git commit -v -m' -alias gc!='git commit -v --amend' - -alias gst='git status' -alias gd='git diff' -alias gl='git log' - -alias gp='git push' - -grename() { - if [[ -z "$1" || -z "$2" ]]; then - echo "Usage: $0 old_branch new_branch" - return 1 - fi - - # Rename branch locally - git branch -m "$1" "$2" - # Rename branch in origin remote - if git push origin :"$1"; then - git push --set-upstream origin "$2" - fi -} - -g_most_edited() { - git log --pretty=format: --name-only "$@" | \ - sort | \ - uniq -c | \ - sort -rg | \ - grep -E -v '.(html|scss|json)$' | \ - head -n 10 \ - ; -} - |
