Permalink
Browse files

Git config tweaks

 - Made `git hist` work better
 - Add `git wdiff` for word diffs
 - Global git ignore
  • Loading branch information...
1 parent e73a8cb commit fae21509d09fe414f8d8b720ffaa7a311cd32e5d Tim Heap committed Mar 29, 2012
Showing with 41 additions and 1 deletion.
  1. +6 −1 gitconfig
  2. +35 −0 gitignore_global
View
@@ -10,8 +10,13 @@
[format]
pretty = %Cblue%h%Creset %ar %Cgreen%an%Creset %s%C(yellow)%d
[alias]
- hist = log --graph --date=short --all
+ hist = log --graph --date=short --all --date-order
sync = !git pull --rebase && git push
+ wdiff = diff --color-words
[alias]
[merge]
log = true
+[core]
+ excludesfile = /home/tim/.gitignore_global
+[rebase]
+ autosquash = on
View
@@ -0,0 +1,35 @@
+# Compiled source #
+###################
+*.o
+*.so
+*.pyc
+
+# 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
+
+# Editor/IDE files #
+####################
+*.swp
+*.swo
+
+# Logs and databases #
+######################
+*.log
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db

0 comments on commit fae2150

Please sign in to comment.