dotfiles/bin/git-continue

17 lines
453 B
Plaintext
Raw Permalink Normal View History

2023-09-02 09:41:00 +00:00
#!/usr/bin/env bash
2020-04-29 11:15:38 +00:00
# Continue a rebase or cherry-pick in the event of conflicts.
if [[ -e .git/CHERRY_PICK_HEAD ]] ; then
exec git cherry-pick --continue "$@"
elif [[ -e .git/rebase-apply/applying ]] ; then
exec git rebase --continue "$@"
elif [[ -e .git/rebase-apply ]] ; then
exec git rebase --continue "$@"
elif [[ -e .git/rebase-merge ]] ; then
exec git rebase --continue "$@"
else
echo git-abort: unknown state
2023-09-02 09:41:00 +00:00
exit 1
2020-04-29 11:15:38 +00:00
fi