AdeAttwood/Dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
108 commits 1 branch 0 tags 76 MiB
Perl 29.4%
Lua 22.9%
Shell 17.5%
Emacs Lisp 9.4%
Vim Script 6%
Other 14.8%
Find a file
Ade Attwood f386272007 feat(bin): detect merge conflicts in merge-patch 
When merge patching it will now detect if there is an unresolved conflict in
your current branch and exit without doing anything.

This is useful when merging multiple branches at once, if you hit a conflict
half way though it would remove the "MERGE_PATCH" file and lose where you where
in the patch

Now the script will exit and not lose the position so you can `--continue`
correctly after fixing the conflicts
2022-02-15 20:24:45 +00:00
data refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
manifests improvement: add checksums to downloads 2020-11-22 21:07:44 +00:00
scripts fix(core): sync puppet modules before applying the manifests 2020-09-21 20:08:52 +01:00
site-modules feat(bin): detect merge conflicts in merge-patch 2022-02-15 20:24:45 +00:00
.gitignore feat(pp): update to bolt v3 2021-04-30 20:45:06 +01:00
bolt-project.yaml feat(pp): update to bolt v3 2021-04-30 20:45:06 +01:00
bolt.yaml refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
hiera.yaml refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
Puppetfile feat(core): add private puppet module for the proprietary stuff 2020-09-21 20:13:28 +01:00
README.md add windows install 2016-11-20 09:22:46 +00:00

README.md

Install Unix

Warning this install will override any dotfiles and the full vim bundle directory!

git clone https://github.com/AdeAttwood/Dotfiles.git ~/.dotfiles
chmod +x ~/.dotfiles/install/install_unix.sh
~/.dotfiles/install/install_unix.sh

Install Windows

git clone https://github.com/AdeAttwood/Dotfiles.git %USERPROFILE%\_dotfiles
%homepath%\_dotfiles\install\install_win10.bat