X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=1c42cdfd28230dfa34aac67dd9f1ba97fed27ef0;hp=7b76f4197746fae1a392d1acd99f7b442cd9e2b4;hb=d94ce439cce4ee12e391be2e082905347c628bf3;hpb=9fb6cc6a2d46ce2e3cc358b59a310ad631be2843 diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in index 7b76f41..1c42cdf 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 --no-patch --date=short --pretty='format:%h (%s, %ad)' # describe, same as --pretty=reference a = add ap = add --patch au = add --update @@ -125,9 +125,9 @@ fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo ## Misc. sl = stash list - ss = stash save - ssk = stash save --keep-index - ssu = stash save --include-untracked + ss = stash push + ssk = stash push --keep-index + ssu = stash push --include-untracked sa = stash apply --index sp = stash pop --index @@ -141,8 +141,8 @@ tig = ! PWD/bin/tig.pl # Create backup of uncommitted and untracked changes. - ssb = "! git stash save --include-untracked \ - \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \ + ssb = "! git stash push --include-untracked \ + -m \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \ >/dev/null \ && git stash apply >/dev/null" @@ -174,6 +174,10 @@ # Highlight moved code in a different color. colorMoved = zebra + # Highlight whitespace errors (at the end of the line) in all lines of + # a diff; the default shows them only in new lines + wsErrorHighlight = old,new,context + # Replace "a/" and "b/" prefix in diffs with characters describing the # context (e.g. "i/"ndex and "w/"ork tree). mnemonicprefix = true @@ -189,7 +193,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,11 +242,25 @@ # Disable annoying advice messages. waitingForEditor = false +[init] + # Don't create .git/hooks with any sample hooks. Reduces the clutter + # in new git repositories. + templateDir = + # Keep the default branch name + defaultBranch = master + # NON-GIT SETTINGS [annex] # My SSH config already uses ControlMaster where appropriate. sshcaching = false + # Don't upgrade repositories automatically + autoupgraderepository = false + # Force `git add` to add to git, never to annex + gitaddtoannex = false + # Consider dotfiles to be `git annex add`able; restrictions of + # annex.largefiles (if set) are still applied + dotfiles = true # vim: ft=gitconfig