opdavies/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add git-abort and git-continue

Browse source
This commit is contained in:
Oliver Davies 2020-04-29 12:15:38 +01:00
parent a8d75fc417
commit 4a8fd3b6a0
2 changed files with 36 additions and 0 deletions

16
bin/git-continue Executable file
View file

@ -0,0 +1,16 @@
#!/bin/bash
# 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
exit -1
fi