X-Git-Url: http://lab.mitty.jp/git/?a=blobdiff_plain;f=TipAndDoc%2F.gitconfig;h=5fa149f5b2b2b3a4f052fd8e59c88d6c79426a14;hb=8c3e911576ed3d6966ad4105a7743096e423065f;hp=ec15ecfeb909c8129ca8e621f902a58fa5c8e6fa;hpb=0dcad9abe1cc8f06f6a1bdbc679b04844abf86c5;p=lab.git

diff --git a/TipAndDoc/.gitconfig b/TipAndDoc/.gitconfig
index ec15ecf..5fa149f 100644
--- a/TipAndDoc/.gitconfig
+++ b/TipAndDoc/.gitconfig
@@ -4,10 +4,16 @@
 [color]
 	ui = true
 [alias]
-	co = checkout
-	ci = commit
-	st = status
 	br = branch
+	ca = diff --cached
+	ci = commit
+	co = checkout
 	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+	ls = ls-files
+	nm = branch --no-merged
+	st = status
+	uno = status -uno
 [core]
 	excludesfile = ~/.gitignore
+[svn]
+	pushmergeinfo = true