Use stow for managing dotfiles
This commit is contained in:
parent
7b29ee2104
commit
7fed1cf922
83 changed files with 61 additions and 40 deletions
bin
|
@ -1,16 +0,0 @@
|
|||
#!/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
|
Loading…
Add table
Add a link
Reference in a new issue