commit 9175ba17c8962fe9ecae2901b50ee9575383c0af parent de4369438bf227dbe3a0b7f0aa41877bdb18f7d2 Author: Yuval Langer <yuval.langer@gmail.com> Date: Thu, 12 May 2016 20:32:50 +0300 Merge remote-tracking branch 'git/master' Diffstat:
| A | dotgit/gitconfig | | | 29 | +++++++++++++++++++++++++++++ |
| A | dotgit/gitignore_global | | | 90 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
2 files changed, 119 insertions(+), 0 deletions(-)
diff --git a/dotgit/gitconfig b/dotgit/gitconfig @@ -0,0 +1,29 @@ +[user] + name = Yuval Langer + email = yuval.langer@gmail.com + signingkey = 92DEA7D8 +[gui] + fontdiff = -family Inconsolata -size 16 -weight normal -slant roman -underline 0 -overstrike 0 +[core] + editor = vim + excludesfile = /home/yankel/.gitignore_global +[diff] + tool = diff +[difftool] + tool = meld +[push] + default = tracking +[alias] + lg = log --all --graph --decorate --color + df = diff --word-diff + l = log --graph --decorate --color --oneline +[mergetool] + cmd = meld "$LOCAL" "$MERGED" "$REMOTE" +[github] + user = yuvallanger +[merge] + tool = meld +[color] + ui = true +[branch] + autosetuprebase = always diff --git a/dotgit/gitignore_global b/dotgit/gitignore_global @@ -0,0 +1,90 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Rope +.ropeproject + +# Django stuff: +*.log +*.pot + +# Sphinx documentation +docs/_build/ + +local_settings.py