fix(scripts): shebang and exit code
This commit is contained in:
parent
4bea747ffa
commit
b659f491ea
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue