X-Git-Url: http://lab.mitty.jp/git/?a=blobdiff_plain;f=TipAndDoc%2F.gitconfig;h=759195c1f5a6955f8a3f82a2723cb75dbc2c9745;hb=dea39adf7092e50482b7076d949a90f2f9d08ee9;hp=3ee0900e21272a86a5dbbc2d61a5ccabbc06c50f;hpb=b949a0f80b773a49f5029132c716ce019507e3bd;p=lab.git

diff --git a/TipAndDoc/.gitconfig b/TipAndDoc/.gitconfig
index 3ee0900..759195c 100644
--- a/TipAndDoc/.gitconfig
+++ b/TipAndDoc/.gitconfig
@@ -1,13 +1,18 @@
-[user]
-	name = Ken-ichi Mito
-	email = mitty@mitty.jp
-[color]
-	ui = true
-[alias]
-	co = checkout
-	ci = commit
-	st = status
-	br = branch
-	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
-[core]
-	excludesfile = ~/.gitignore
+[user]
+	name = Ken-ichi Mito
+	email = mitty@mitty.jp
+[color]
+	ui = true
+[alias]
+	br = branch
+	ca = diff --cached
+	ci = commit -v
+	co = checkout
+	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+	ls = ls-files
+	nm = branch --no-merged
+	st = status -uno
+[core]
+	excludesfile = ~/.gitignore
+[svn]
+	pushmergeinfo = true