From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 30 May 2018 14:56:12 +0000 (+0100)
Subject: Merge branch 'master' into fairchild
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/refs/heads/fairchild?hp=-c

Merge branch 'master' into fairchild

* master: (21 commits)
  dot/ipython-key-bindings.py: Fix because IPython is now (fr)agile.
  dot/zshrc: Fix path ellipsization in the prompt.
  dot/emacs-calc: Add peta- and exa- prefixes for bits and bytes.
  el/dot-emacs.el: Add a useful `w3m' binding to open links in new tabs.
  dot/gitconfig.in: Don't have `git send-email' try to do threading.
  dot/gitconfig.in: Abolish the `git email' alias.
  dot/gitconfig.in: Remove output filename; force full indices.
  git/gitignore: Ignore toplevel `p/' and `p.*/' directories.
  git/gitignore: Only ignore `build' etc. if they're toplevel directories.
  git/gitignore: Deprecate `deb-build/' and `build-*/' directories.
  dot/gitconfig.in: Configure `format-patch' to do sensible things.
  el/dot-emacs.el: Override git's use of a pager more vigorously.
  dot/zshrc: Don't have `typeset -x' implicitly make variables global.
  el/dot-emacs.el: Suppress `/dev/null' filename when running `git grep'.
  dot/zshrc: Recognize the keypad keys.
  dot/zshrc: Commentary for running `~/.zshrc-local'.
  dot/zshrc: Interpret `**' to cover files too, where sensible.
  dot/zshrc: Include parser content in the second-level prompt.
  dot/shell-rc: Add a hook for shell-specific `PS2' customization.
  dot/shell-rc: Don't expand `TERM' or `INSIDE_EMACS' if they're not defined.
  ...
---

f27ec9aae2058422d7c4011d626ca346b44fa472
diff --combined dot/gitconfig.in
index 9b96177,0bc63d1..369c091
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@@ -46,6 -46,9 +46,9 @@@
  
  [format]
  	headers = "Organization: Straylight/Edgeware\n"
+ 	coverletter = auto
+ 	thread = shallow
+ 	signature = "[mdw]"
  
  [color]
  	ui = auto
@@@ -79,13 -82,13 +82,13 @@@
  	external = --color=always
  
  [pager]
 -	log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
 -	show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
 -	diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
 +	##log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
 +	##show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
 +	##diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
  
  [alias]
  	egrep = "grep -E"
- 	patch = "format-patch -o p -s"
+ 	patches = "format-patch --full-index"
  	graph = "log --pretty=oneline --abbrev-commit --graph"
  	release = !"sh -e -c ' \
  		[ $# -gt 0 ] || { \
@@@ -96,11 -99,6 +99,6 @@@
  	amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
  	spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
  		xargs -0r space -cv' spaces"
- 	mailto = "send-email \
- 			--quiet \
- 			--no-chain-reply-to \
- 			--no-signed-off-by-cc \
- 			--to"
  	files = "ls-files --exclude-standard"
  	unstg = !"sh -e -c ' \
  		: ${GIT_DIR=$(git rev-parse --git-dir)}; \
@@@ -131,6 -129,7 +129,7 @@@
  	aliasesfile = @profile@/dot/mailrc
  	aliasfiletype = mailrc
  	chainreplyto = no
+ 	thread = no
  	signedoffbycc = yes
  	suppresscc = self