X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.gitconfig;h=2797757395b51c4c7f34acc6b921991479e096a0;hb=9c35415b4f1f3bde1b09b40ae765cf377d204b93;hp=4844c2fe6322a99519392e9a31146c4ef54c249a;hpb=2c924eaf62be71340f26c6292efb3a72dc8f994a;p=grml-etc-core.git

diff --git a/etc/skel/.gitconfig b/etc/skel/.gitconfig
index 4844c2f..2797757 100644
--- a/etc/skel/.gitconfig
+++ b/etc/skel/.gitconfig
@@ -13,16 +13,13 @@
 #    name = Grml User
 #    email = git@grml.org
 
-[core]
-    pager = less -Mr
-
 [format]
     numbered = auto
 
 [color]
-    branch = auto
+    branch = yes
     diff   = auto
-    pager  = auto
+    pager  = yes
     status = auto
 
 #[color "branch"]
@@ -45,6 +42,7 @@
 #[gui]
 #    fontui   = -family terminus -size 9 -weight normal -slant roman -underline 0 -overstrike 0
 #    fontdiff = -family terminus -size 9 -weight normal -slant roman -underline 0 -overstrike 0
+#    editor = gvim
 
 [svn]
     rmdir = true
@@ -64,11 +62,12 @@
     mnc   = merge --no-commit
     olg   = log --abbrev-commit --abbrev=6 --pretty=oneline
     one   = "!sh -c 'git show -s --pretty=\"tformat:%h (%s, %ai\" \"$@\" | sed -e \"s/ [012][0-9]:[0-5][0-9]:[0-5][0-9] [-+][0-9][0-9][0-9][0-9]$/)/\"' -"
-    out   = push --dry-run
+    out   = !git push --dry-run
     purge = !git checkout $(git rev-parse --show-cdup) && git clean -xdf
     serve = !sh -c 'git daemon --reuseaddr --verbose \"$@\" --base-path=. --export-all ./.git' sh
     stgd  = diff --cached
     st    = status
+    tagme = !sh -c '[ -z "$1" ] && exit 1 || git tag -s v\"$1\" -m \"release \"$1\"\"' sh
     tush  = push --tags
     who   = "!sh -c 'git log -1 --pretty=\"format:%an <%ae>\" --author=\"$1\"' -"