X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=.config%2Fgit%2Fconfig;h=6db954eb056d8a2f004881d08c4bc4d59edc487e;hb=679cc91a2dec03c25ff7316713c5ae2a6760e43e;hp=afd3ff99afd74230044988196eae79c508d0919f;hpb=ea754f29a1595614cbccf3454e18aa275036de88;p=user%2Fhenk%2Fvcsh%2Fgit.git

diff --git a/.config/git/config b/.config/git/config
index afd3ff9..6db954e 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,6 +1,6 @@
 [user]
-	name = Hendrik Jäger
-	email = hendrik@securosys.ch
+    name = Hendrik Jäger
+    email = hendrik@securosys.ch
 
 # push/pull/diff/options
 [push]
@@ -26,6 +26,7 @@
     cl = clone
     ci = commit
     co = checkout
+    cob = checkout -b
     br = branch
     r = reset
     cp = cherry-pick
@@ -43,6 +44,7 @@
 # commit {{{
     cm = commit -m
     cma = commit -a -m
+    cmv = commit -a -v
     ca = commit --amend
     amend = commit --amend
     caa = commit -a --amend -C HEAD
@@ -54,6 +56,8 @@
     lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
     fl = log -u
     filelog = log -u
+    lg  = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+    lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
 # }}}
 # diff {{{
     d = diff --word-diff
@@ -97,8 +101,11 @@
 # }}}
 # various useful {{{
     # last tag created
-    lasttag = describe --tags --abbrev=0
-    lt = describe --tags --abbrev=0
+    lasttag = "describe --tags --abbrev=0"
+    lt = "describe --tags --abbrev=0"
+
+    # tag logs
+    taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
 
     # conflict/merges
     ours = "!f() { git co --ours $@ && git add $@; }; f"