From 1e4968e1e1b14a5b5d699aecf10e7f6f779c67a8 Mon Sep 17 00:00:00 2001 From: Ade Attwood Date: Tue, 16 Mar 2021 20:18:15 +0000 Subject: [PATCH] feat(git): update merge-to to rebase onto target branch Now when merging to it will rebase onto the target branch to make merge-to work more. I was finding that it will fail and I was doing the merge step all the time so now its built in. --- site-modules/core/files/bin/git-merge-to | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/site-modules/core/files/bin/git-merge-to b/site-modules/core/files/bin/git-merge-to index 9d88cb2..029d76b 100755 --- a/site-modules/core/files/bin/git-merge-to +++ b/site-modules/core/files/bin/git-merge-to @@ -14,8 +14,22 @@ main() { local branch=$(git rev-parse --abbrev-ref HEAD); echo "Merging $branch with $MERGE_BRANCH"; + # + # Ensure the target branch is up to date + # + git checkout $MERGE_BRANCH + git pull origin $MERGE_BRANCH + git checkout $branch + + # + # Rebase onto branch so we don't create a merge commit + # + git rebase $MERGE_BRANCH; + + # + # Merge into the target branch ensuring its a fast forward merge + # git checkout $MERGE_BRANCH; - git pull origin $MERGE_BRANCH git merge --ff-only --log $branch; }