X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=aa0ef858a5ff1855519f32dc57331145051914b4;hp=3d3afced140e378df75a71c99417c4d37a937425;hb=9e4b2aff9242c3e72c714c3bf01c670b576e6627;hpb=4fc2ad6c2abc2b857d52d14ac948d21e96390ab3 diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in index 3d3afce..aa0ef85 100644 --- a/vcs/gitconfig.in +++ b/vcs/gitconfig.in @@ -1,6 +1,6 @@ # Global Git configuration file. -# Copyright (C) 2011-2017 Simon Ruderich +# Copyright (C) 2011-2018 Simon Ruderich # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ ## Local. c = commit --verbose ca = commit --verbose --amend - cad = commit --verbose --amend --date= + cad = commit --verbose --amend --date=now d = diff dw = diff --color-words ds = diff --stat @@ -76,7 +76,7 @@ ls = log --stat lp = log --patch lpw = log --patch --color-words - ld = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe + ld = show --date=short --no-patch --pretty='format:%h (\"%s\", %ad)' # describe a = add ap = add --patch au = add --update @@ -189,7 +189,7 @@ wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_] # Rules to allow diffing of some binary files. Disabled by default to prevent -# programs from running them on arbitrary files via a .local .gitattributes +# repositories from running them on arbitrary files via a local .gitattributes # file. Copy them to .git/config of the repository to enable them. # # "sh -c '..' ARGV0" is used when the programs require additional arguments @@ -238,6 +238,11 @@ # Disable annoying advice messages. waitingForEditor = false +[init] + # Don't create .git/hooks with any sample hooks. Reduces the clutter + # in new git repositories. + templateDir = + # NON-GIT SETTINGS