Permalink
Browse files

Git config

  • Loading branch information...
jferris committed Jan 13, 2011
1 parent 194e865 commit dd31bb3cde79aaab031e4a16ca28d20605ed8cb2
Showing with 38 additions and 0 deletions.
  1. +34 −0 gitconfig
  2. +4 −0 gitignore
View
@@ -0,0 +1,34 @@
+# ADD LOCAL CONFIGURATION HERE
+
+
+# DO NOT EDIT BELOW THIS LINE
+[push]
+ default = tracking
+[color]
+ diff = auto
+ status = auto
+ branch = auto
+[core]
+ excludesfile = ~/.gitignore
+[format]
+ pretty = %Cblue%h%Creset %Cgreen[%ar]%Creset (%an) %s
+[alias]
+ c = commit -m
+ a = !git add -u && git add . && git status -s
+ di = diff
+ dic = diff --cached
+ pl = pull
+ ps = push
+ plre = pull --rebase
+ st = status -s
+ graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+ ci = commit
+ ca = commit --amend
+ pr = remote prune origin
+ up = !git fetch origin && git rebase origin/master
+ rbc = rebase --continue
+ rbi = rebase -i
+ mm = !test `git rev-parse master` = $(git merge-base HEAD master) && git checkout master && git merge HEAD@{1} || echo "Non-fastforward"
+ ap = commit --amend -C HEAD
+ co = checkout
+ adi = !git add -u && git add . && git diff --cached
View
@@ -0,0 +1,4 @@
+.*.swp
+tmp/tags
+.*.swo
+*.scratch.*

0 comments on commit dd31bb3

Please sign in to comment.