Article.md

Idiot-Proof Git Aliases

bash_or_zsh.rc

function git_current_branch() {
  git symbolic-ref HEAD 2> /dev/null | sed -e 's/refs\/heads\///'
}

alias gpthis='git push origin HEAD:$(git_current_branch)'
alias grb='git rebase -p'
alias gup='git fetch origin && grb origin/$(git_current_branch)'
alias gm='git merge --no-ff'

git_current_branch.fish

function git_parse_branch
  sh -c 'git symbolic-ref HEAD 2> /dev/null' | sed -e 's/refs\/heads\///'
end

gm.fish

function gm
  git merge --no-ff $argv; 
end

gpthis.fish

function gpthis
  git push origin HEAD:(git_parse_branch) $argv
end

gup.fish

function gup
  git fetch origin; and git rebase -p origin/(git_parse_branch) $argv; 
end

This gist's related to http://notes.envato.com/developers/rebasing-merge-commits-in-git/