oysteikt/nix-dotfiles
1
2
Fork 0
Code Issues 141 Pull Requests Activity

home/git: add rebase-fixups script

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2024-11-13 16:57:00 +01:00
parent a5cad921ff
commit 84c9562bfc
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
home/programs/git/scripts/git-rebase-fixups.sh Normal file
View File

@@ -0,0 +1,10 @@
if [ -n "${1:-}" ]; then
TARGET_BRANCH="$1"
shift
else
TARGET_BRANCH=$(git remote show origin | sed -n '/HEAD branch/s/.*: //p')
fi
FORK_POINT=$(git merge-base --fork-point "$TARGET_BRANCH")
git rebase "$FORK_POINT" --autosquash "$@"