Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

updated from work machine; changed order

  • Loading branch information...
commit 097240b455af363bd2f98cc9212c0cfd06801109 1 parent 37757cc
Noel authored October 30, 2012

Showing 1 changed file with 13 additions and 12 deletions. Show diff stats Hide diff stats

  1. 25  gitconfig
25  gitconfig
@@ -3,6 +3,19 @@
3 3
 	email = noel@mailinator.com
4 4
 [github]
5 5
 	user = noelweichbrodt
  6
+[core]
  7
+	whitespace = trailing-space,space-before-tab
  8
+	autocrlf = input
  9
+[alias]
  10
+	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
  11
+	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'
  12
+	amend = commit --amend -C HEAD
  13
+	changes = diff --name-status -r
  14
+	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"
  15
+	lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
  16
+	ls-ignored = ls-files --exclude-standard --ignored --others
  17
+	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'
  18
+	undo = reset --soft HEAD^
6 19
 [color]
7 20
 	ui = auto
8 21
 [color "branch"]
@@ -20,18 +33,6 @@
20 33
 	added = yellow
21 34
 	changed = green
22 35
 	untracked = cyan
23  
-[alias]
24  
-	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
25  
-	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'
26  
-	amend = commit --amend -C HEAD
27  
-	changes = diff --name-status -r
28  
-	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"
29  
-	lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
30  
-	ls-ignored = ls-files --exclude-standard --ignored --others
31  
-	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'
32  
-	undo = reset --soft HEAD^
33  
-[core]
34  
-	whitespace = trailing-space,space-before-tab
35 36
 [diff]
36 37
 	renames = copies
37 38
 [merge]

0 notes on commit 097240b

Please sign in to comment.
Something went wrong with that request. Please try again.