Merge remote-tracking branch 'origin/github/pr/104'

[grml-etc-core.git] / etc / skel / .gitconfig

diff --git a/etc/skel/.gitconfig b/etc/skel/.gitconfig
index a3cd3a8..2797757 100644 (file)
--- a/etc/skel/.gitconfig
+++ b/etc/skel/.gitconfig
@@ -5,12 +5,13 @@
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
-[user]
-    name = Grml User
-    email = git@grml.org
-
-[core]
-    pager = less -Mr
+# Notice: We do not set user section by default so syncing
+# with this file is as easy as possible. Use
+# GIT_AUTHOR_NAME, GIT_COMMITTER_NAME, GIT_AUTHOR_EMAIL and
+# GIT_COMMITTER_EMAIL via your shell environment instead.
+#[user]
+#    name = Grml User
+#    email = git@grml.org
 
 [format]
     numbered = auto
@@ -21,56 +22,60 @@
     pager  = yes
     status = auto
 
-[color "branch"]
-    current = green
-    local   = yellow
-    remote  = cyan
-
-[color "diff"]
-    meta = yellow
-    frag = magenta
-    old  = red
-    new  = green
-
-[color "status"]
-    header    = magenta
-    added     = yellow
-    changed   = green
-    untracked = cyan
+#[color "branch"]
+#    current = green
+#    local   = yellow
+#    remote  = cyan
+#
+#[color "diff"]
+#    meta = yellow
+#    frag = magenta
+#    old  = red
+#    new  = green
+#
+#[color "status"]
+#    header    = magenta
+#    added     = yellow
+#    changed   = green
+#    untracked = cyan
 
 #[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
 
-[http]
-    sslVerify=false
+#[http]
+#    sslVerify=false
 
 [alias]
-    b    = branch
-    ca   = commit -a
-    chgd = diff HEAD
-    ci   = commit
-    co   = checkout
+    b     = branch
+    ca    = commit -a
+    chgd  = diff HEAD
+    ci    = commit
+    co    = checkout
+    fpu   = format-patch -s -p origin/master
     graphviz = "!f() { echo 'digraph git {' ; git log --pretty='format:  %h -> { %p }' \"$@\" | sed 's/[0-9a-f]\\+/\"&\"/g' ; echo '}'; }; f"
-    m    = checkout master
-    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 = !git push --dry-run
+    m     = checkout master
+    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   = !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
-    tush = push --tags
-    who  = "!sh -c 'git log -1 --pretty=\"format:%an <%ae>\" --author=\"$1\"' -"
+    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\"' -"
 
 #[sendemail]
 #    aliasesfile   = /home/grml/.gitaliases
 #    aliasfiletype = mutt
 #    chainreplyto  = false
+#    smtpserver = /usr/bin/msmtp
 
 ## END OF FILE #################################################################
 # vim:tabstop=4 autoindent filetype=gitconfig expandtab