Ade Attwood a94a9d6dc2 feat(bin): support merge-patch --skip ... When hitting a conflict with no changes you can `--skip` just like you would if you where rebaseing and running `rebase --skip`		2022-02-15 20:31:59 +00:00
..
bin	feat(bin): support merge-patch --skip	2022-02-15 20:31:59 +00:00
emacs	refactor(emacs): replace treemacs with neotree	2021-11-21 16:49:47 +00:00
fonts	refactor(core): start to make dotfiles public	2020-09-20 06:22:17 +01:00
oh-my-zsh	fix(shell): fzf escaping	2021-11-21 16:43:41 +00:00
scripts	refactor(core): start to make dotfiles public	2020-09-20 06:22:17 +01:00
vim	refactor(core): start to make dotfiles public	2020-09-20 06:22:17 +01:00
vscode	improvement(code): remove line numbers and add defaultFormatter	2020-11-22 21:09:34 +00:00
alacritty.yml	feat(term): add alacritty and base16 colours	2020-09-20 21:13:11 +01:00
tmux.conf	chore(tmux): updates to the term mode	2021-11-21 16:32:08 +00:00
zshrc	refactor(shell): remove emacs zsh plugin and create my own	2021-11-21 16:13:12 +00:00