Git Helpers

git-helpers.sh

function git-reset-commits(){
  branch=$(git branch | grep \* | cut -d ' ' -f2)

  remote=upstream
  basebranch=$branch

  if [ "$#" = 1 ]; then
    basebranch=$1
  elif [ "$#" -gt 1 ]; then
    remote=$1
    basebranch=$2
  fi

  git fetch $remote $basebranch
  commit=$(git merge-base $remote/$basebranch $branch)
  
  echo "resetting current branch $branch to base branch $remote/$basebranch via commit $commit"
  
  git reset $commit
}

function git-rebase(){
  remote=upstream
  branch=$(git branch | grep \* | cut -d ' ' -f2)

  if [ "$#" = 1 ]; then
    branch=$1
  elif [ "$#" -gt 1 ]; then
    remote=$1
    branch=$2
  fi

  echo "rebasing branch $branch from remote $remote"

  git fetch $remote $branch
  git rebase $remote/$branch
}

function git-since-master(){
  local default_branch="main"
  if [ -f "$(git rev-parse --show-toplevel)/.git/refs/heads/master" ]
  then
    default_branch="master"
  fi
  local branch="$1"
  if [ "$1" = "" ]
  then
      branch=`git branch --show-current`
  fi
  git diff `git merge-base --fork-point ${default_branch} ${branch}` $branch
}