* add alias 'git tree'

[lab.git] / TipAndDoc / .gitconfig

diff --git a/TipAndDoc/.gitconfig b/TipAndDoc/.gitconfig
index ec15ecf..ef93437 100644 (file)
--- 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 -v -uno
+       co = checkout
        hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+       ls = ls-files
+       nm = branch --no-merged
+       st = status -uno
+       tree = log --pretty=format:\"%h %ad %d\" --graph --simplify-by-decoration --all --date=short
 [core]
        excludesfile = ~/.gitignore
+[svn]
+       pushmergeinfo = true