X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.config%2Fgit%2Fconfig;h=35c05f47dafde78b5de240b6cf94724b3c2ce9dd;hb=8dd32849d857bed785f64ecae42d9d0e8e843ad9;hp=8df0a7c0050f0a50f6607d502d6a83f0755e7a0b;hpb=48f2ac8d148664b25e1e6bb0495c874d2c6e1bfe;p=user%2Fhenk%2Fvcsh%2Fgit.git

diff --git a/.config/git/config b/.config/git/config
index 8df0a7c..35c05f4 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,10 +26,12 @@
     cl = clone
     ci = commit
     co = checkout
+    cob = checkout -b
     br = branch
     r = reset
     cp = cherry-pick
     gr = grep -Ii
+    please = push --force-with-lease
 # }}}
 # tweak defaults {{{
     diff = diff --word-diff
@@ -43,6 +45,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 +57,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 +102,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"
@@ -134,3 +142,5 @@
     # undo from here http://megakemp.com/2016/08/25/git-undo/
     undo = "!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f"
 # }}}
+
+serve = !git daemon --reuseaddr --verbose  --base-path=. --export-all ./.git