gistfile1.txt

# git shortcuts
alias gc='git commit -v'
alias gst='git status -sb'
alias gcvam='gc -v -a -m '
alias gcvm='gc -v -m '
alias gsl='git stash list'
alias fetch='git fetch'
alias co='git checkout'

function gpull()
{
  if [ -z "$2" ]; then
    BRANCH=`git branch | grep "*" | awk '{print $2}'`
  else
    BRANCH=$2
  fi

  if [ -z "$1" ]; then
    REMOTE='origin'
  else
    REMOTE=$1
  fi

  CMD="git pull --rebase $REMOTE $BRANCH"
  echo $CMD
  git pull --rebase $REMOTE $BRANCH
}

function gpush()
{
  if [ -z "$2" ]; then
    BRANCH=`git branch | grep "*" | awk '{print $2}'`
  else
    BRANCH=$2
  fi

  if [ -z "$1" ]; then
    REMOTE='origin'
  else
    REMOTE=$1
  fi

  CMD="git push $REMOTE $BRANCH"
  echo $CMD
  git push $REMOTE $BRANCH
}


function merge()
{
  if [ -z "$2" ]; then
    BRANCH=`git branch | grep "*" | awk '{print $2}'`
  else
    BRANCH=$2
  fi

  if [ -z "$1" ]; then
    REMOTE='origin'
  else
    REMOTE=$1
  fi

  CMD="git merge $REMOTE/$BRANCH"
  echo $CMD
  git merge $REMOTE/$BRANCH
}