Rebase and push fixups from a code review

git-rebase-fixups

#!/bin/bash
set -e

# This script automates the process of rebasing some fixed-up commits (e.g. from a PR review) on the default branch
# of a remote repository. It expects changes to have been committed with `git commit --fixup ...` and to have the
# changed branch currently checked out.

# Retrieve the default branch of the origin remote.
DEFAULT_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
(set -x; git fetch origin $DEFAULT_BRANCH:$DEFAULT_BRANCH)

# Rebase the fixed-up commits on to the default branch.
(set -x; git rebase --autosquash $DEFAULT_BRANCH)

# To double-check that things look right, list the files changed by commit.
(set -x; git log --oneline --name-only $DEFAULT_BRANCH..HEAD)

# Optionally force-push the changed branch.
CHANGE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo "Force-push to branch $CHANGE_BRANCH? [y/N]"
read PUSH
if [[ $PUSH == "y" ]]; then
  (set -x; git push --force)
fi