Permalink
Browse files

updated from work machine; changed order

  • Loading branch information...
1 parent 37757cc commit 097240b455af363bd2f98cc9212c0cfd06801109 @noelweichbrodt committed Oct 30, 2012
Showing with 13 additions and 12 deletions.
  1. +13 −12 gitconfig
View
25 gitconfig
@@ -3,6 +3,19 @@
email = noel@mailinator.com
[github]
user = noelweichbrodt
+[core]
+ whitespace = trailing-space,space-before-tab
+ autocrlf = input
+[alias]
+ prettylog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(green(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+ prettyfiles = log --graph --diff-filter[ACDMR] --name-status --pretty --source --abbrev-commit --format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(green(%cr) %C(bold blue)<%an>%Creset'
+ amend = commit --amend -C HEAD
+ changes = diff --name-status -r
+ l = "!git log --graph --pretty='tformat:%C(yellow)%h{%C(green)%ar{%C(bold blue)%an{%C(red)%d%C(reset) %s' $* | column -t -s '{' | less -FXRS"
+ lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+ ls-ignored = ls-files --exclude-standard --ignored --others
+ ra = !git log --graph --abbrev-commit --date=relative -20 --all --pretty='format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'
+ undo = reset --soft HEAD^
[color]
ui = auto
[color "branch"]
@@ -20,18 +33,6 @@
added = yellow
changed = green
untracked = cyan
-[alias]
- prettylog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(green(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
- prettyfiles = log --graph --diff-filter[ACDMR] --name-status --pretty --source --abbrev-commit --format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(green(%cr) %C(bold blue)<%an>%Creset'
- amend = commit --amend -C HEAD
- changes = diff --name-status -r
- l = "!git log --graph --pretty='tformat:%C(yellow)%h{%C(green)%ar{%C(bold blue)%an{%C(red)%d%C(reset) %s' $* | column -t -s '{' | less -FXRS"
- lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
- ls-ignored = ls-files --exclude-standard --ignored --others
- ra = !git log --graph --abbrev-commit --date=relative -20 --all --pretty='format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'
- undo = reset --soft HEAD^
-[core]
- whitespace = trailing-space,space-before-tab
[diff]
renames = copies
[merge]

0 comments on commit 097240b

Please sign in to comment.