X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=159cbaacf36bb4a51e7f631221b730ded013e337;hb=5aefc04d52d746c8ba65bc9bb2fe1aba6ec8521f;hp=766831a53605971fd0bab8cd729471edab53123d;hpb=ea2f138b3c58f34e7907654a10f7e9a9053657a1;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 766831a..159cbaa 100644 --- a/gitconfig.m4 +++ b/gitconfig.m4 @@ -1,6 +1,6 @@ # Global Git configuration file. -# Copyright (C) 2011-2012 Simon Ruderich +# Copyright (C) 2011-2013 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 @@ -42,14 +42,17 @@ include(../lib.m4) [core] editor = vim - # Can't use ~/ because of older git versions. - excludesfile = GITIGNORE # Use pager for the following commands. [pager] status = yes tag = yes +[interactive] + # Don't require in interactive commands which require only a + # single key, for example `git add --patch`. + singlekey = yes + [alias] ## Shortcuts for often used commands. # @@ -106,14 +109,18 @@ include(../lib.m4) ## Misc. sl = stash list ss = stash save + ssk = stash save --keep-index sa = stash apply sp = stash pop - ssk = stash save --keep-index ## Custom commands. # - # tig-like log view. - glog = log --pretty=oneline --graph --all + # tig-like log view. Similar to the following but with author/date + # information. --pretty=format is not used because it doesn't allow + # precise enough control over formats and colors. + # + # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit + tig = ! TIG | less [diff] # Detect copies and renames. @@ -130,6 +137,7 @@ include(../lib.m4) wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_] # Allow diffing of some binary files. +# # `pdftotext-` is a wrapper around pdftotext which writes to stdout. # `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`. [diff "gzip"]