[Assorted-commits] SF.net SVN: assorted:[1579] configs/trunk/src/gitconfig

[<yan...@us...>]

Revision: 1579
          http://assorted.svn.sourceforge.net/assorted/?rev=1579&view=rev
Author:   yangzhang
Date:     2010-03-18 19:46:35 +0000 (Thu, 18 Mar 2010)

Log Message:
-----------
added git k

Modified Paths:
--------------
    configs/trunk/src/gitconfig

Modified: configs/trunk/src/gitconfig
===================================================================
--- configs/trunk/src/gitconfig	2010-03-12 07:16:15 UTC (rev 1578)
+++ configs/trunk/src/gitconfig	2010-03-18 19:46:35 UTC (rev 1579)
@@ -1,18 +1,21 @@
 [alias]
-	b = branch
-	ci = commit -a
-	co = checkout
+  b = branch
+  ci = commit -a
+  co = checkout
   com = commit
   d = diff
-	dc = diff --cached
-	h = help
-	llog = log --date=local
-	pr = pull --rebase
-	st = status
+  dc = diff --cached
+  h = help
+  llog = log --date=local
+  pr = pull --rebase
+  st = status
   sta = stash
   up = pull
+  k = log --decorate --oneline --graph
 [core]
-	excludesfile = /home/yang/.gitignore
+  excludesfile = /home/yang/.gitignore
 [user]
-	name = Yang Zhang
-	email = ya...@gm...
+  name = Yang Zhang
+  email = ya...@gm...
+[merge]
+  conflictstyle = diff3


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.