fix(scripts): shebang and exit code

This commit is contained in:
Oliver Davies 2023-09-02 10:41:00 +01:00
parent 4bea747ffa
commit b659f491ea
2 changed files with 4 additions and 4 deletions

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Abort a rebase, merge, `am`, a cherry-pick or a revert, depending on the situation.
@ -16,5 +16,5 @@ elif [[ -e .git/MERGE_MODE ]] ; then
exec git merge --abort "$@"
else
echo git-abort: unknown state
exit -1
exit 1
fi

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Continue a rebase or cherry-pick in the event of conflicts.
@ -12,5 +12,5 @@ elif [[ -e .git/rebase-merge ]] ; then
exec git rebase --continue "$@"
else
echo git-abort: unknown state
exit -1
exit 1
fi