AdeAttwood/Dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(bin): support merge-patch --skip

Browse source 
When hitting a conflict with no changes you can `--skip` just like you would if
you where rebaseing and running `rebase --skip`
This commit is contained in:
Ade Attwood 2022-02-15 20:31:59 +00:00
parent f386272007
commit a94a9d6dc2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
site-modules/core/files/bin/git-merge-patch
View file

@ -38,12 +38,12 @@ if [[ ! -z "$(git diff --name-only --diff-filter=U)" ]]; then
exit 1 exit 1
fi fi
if [[ "$MERGE_BRANCH" == "--abort" ]]; then if [[ "$MERGE_BRANCH" == "--abort" ]] || [[ "$MERGE_BRANCH" == "--skip" ]]; then
# #
# If we are in a rebase state then we want to abort that to # If we are in a rebase state then we want to abort that to
# #
if [[ -f "$(git rev-parse --show-toplevel)/.git/REBASE_HEAD" ]]; then if [[ -f "$(git rev-parse --show-toplevel)/.git/REBASE_HEAD" ]]; then
git rebase --abort git rebase $MERGE_BRANCH
fi fi
if [[ -f "$(git rev-parse --show-toplevel)/.git/MERGE_PATCH" ]]; then if [[ -f "$(git rev-parse --show-toplevel)/.git/MERGE_PATCH" ]]; then