diff options
Diffstat (limited to 'config/git')
| -rw-r--r-- | config/git/config | 38 | ||||
| -rw-r--r-- | config/git/ignore | 11 |
2 files changed, 49 insertions, 0 deletions
diff --git a/config/git/config b/config/git/config new file mode 100644 index 0000000..f68fed8 --- /dev/null +++ b/config/git/config @@ -0,0 +1,38 @@ +[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 = /Users/matt/.gitignore + 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 diff --git a/config/git/ignore b/config/git/ignore new file mode 100644 index 0000000..57dd8e6 --- /dev/null +++ b/config/git/ignore @@ -0,0 +1,11 @@ +*.class +*.pyc +*.swo +*.swp +.svn +.swo +*#* +# +.#* +doc/tags +.DS_STORE |