diff options
Diffstat (limited to 'config/git')
| -rw-r--r-- | config/git/config | 43 | ||||
| -rw-r--r-- | config/git/ignore | 11 |
2 files changed, 0 insertions, 54 deletions
diff --git a/config/git/config b/config/git/config deleted file mode 100644 index 0a3bed8..0000000 --- a/config/git/config +++ /dev/null @@ -1,43 +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 - -[merge] - tool = meld - -[diff] - tool = meld - -[init] - defaultBranch = main - -[pull] - ff = only - -[include] - path = config-local diff --git a/config/git/ignore b/config/git/ignore deleted file mode 100644 index 57dd8e6..0000000 --- a/config/git/ignore +++ /dev/null @@ -1,11 +0,0 @@ -*.class -*.pyc -*.swo -*.swp -.svn -.swo -*#* -# -.#* -doc/tags -.DS_STORE |