diff options
| author | Matt Singleton <matt@xcolour.net> | 2024-04-11 16:21:15 -0500 |
|---|---|---|
| committer | Matt Singleton <matt@xcolour.net> | 2024-04-11 16:21:15 -0500 |
| commit | f2dfde23f8157da1532a2b2e236af529fed47713 (patch) | |
| tree | d5eabb0eb33d100304ee16596b2a43dfb4a68d1c /config/all/git | |
| parent | 7f67d28e18760154778f20da43772838c36734ed (diff) | |
replace janky deploy script with stow and make
re-orgs all the console oriented dotfiles to be stowable
makefile to deploy everything
move from vimplug to native vim packages
cleanup script for blowing away old symlinks
Diffstat (limited to 'config/all/git')
| -rw-r--r-- | config/all/git/config | 49 | ||||
| -rw-r--r-- | config/all/git/ignore | 11 |
2 files changed, 0 insertions, 60 deletions
diff --git a/config/all/git/config b/config/all/git/config deleted file mode 100644 index 71bf668..0000000 --- a/config/all/git/config +++ /dev/null @@ -1,49 +0,0 @@ -[user] - name = Matt Singleton - email = matt@xcolour.net - -[alias] - st = status - ci = commit - br = branch - co = checkout - df = diff - lg = log -p - -[core] - whitespace = trailing-space,space-before-tab,cr-at-eol - editor = vim - autocrlf = input - excludesfile = ~/.config/git/ignore - pager = less -+$LESS -RSX - -[push] - default = nothing - -[color] - ui = true - -[mergetool] - keepTemporaries = false - prompt = false - -[mergetool "vimdiff"] - layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE" - -[merge] - tool = vimdiff - conflictstyle = zdiff3 - -[diff] - tool = vimdiff - colorMoved = default - algorithm = histogram - -[init] - defaultBranch = main - -[pull] - ff = only - -[include] - path = config-local diff --git a/config/all/git/ignore b/config/all/git/ignore deleted file mode 100644 index 57dd8e6..0000000 --- a/config/all/git/ignore +++ /dev/null @@ -1,11 +0,0 @@ -*.class -*.pyc -*.swo -*.swp -.svn -.swo -*#* -# -.#* -doc/tags -.DS_STORE |