From 2c924eaf62be71340f26c6292efb3a72dc8f994a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 30 Sep 2008 10:19:12 +0200 Subject: [PATCH] Integrate feedback from Gebi, please review again :) --- etc/skel/.gitconfig | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/etc/skel/.gitconfig b/etc/skel/.gitconfig index 19f8fc6..4844c2f 100644 --- a/etc/skel/.gitconfig +++ b/etc/skel/.gitconfig @@ -20,27 +20,27 @@ numbered = auto [color] - branch = yes + branch = auto diff = auto - pager = yes + pager = auto 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 @@ -49,8 +49,8 @@ [svn] rmdir = true -[http] - sslVerify=false +#[http] +# sslVerify=false [alias] b = branch @@ -64,7 +64,7 @@ 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 + out = 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 -- 2.1.4