[Git] Sync your current branch with another #website

sync-branch.sh

# Add this to your .bash-aliases

function syncBranch() { 
  # Get your current branch
  local CURRENT_BRANCH=$(git symbolic-ref --short HEAD)
  local CURRENT_BRANCH="${CURRENT_BRANCH}"

  # If you don't pass any argument it will use the default branch
  local BASE_BRANCH="${1:-master}"

  # Customize this command as fits you, i.e.: not using --no-ff, using rebase or passing dynamic args, etc... 
  git checkout "${BASE_BRANCH}" && git pull -p && git checkout "${CURRENT_BRANCH}" && git merge "${BASE_BRANCH}" --no-ff
}

# How to use
# $ syncBranch
# $ syncBranch branch-name