From a7f2703697a6b31cfacbf4b04e00677c3f8f3eef Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Wed, 7 Feb 2018 15:59:11 -0600
Subject: [PATCH] test

---
 bin.org   |  8 ++++----
 emacs.org | 27 +++++++++++++++++++++++++++
 git.org   | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/bin.org b/bin.org
index d4b9593..4c46ff1 100644
--- a/bin.org
+++ b/bin.org
@@ -3,11 +3,11 @@
 #+STARTUP: hidestars
 #+STARTUP: odd
 #+BABEL: :cache yes
-#+PROPERTY: header-args :cache yes
+#+PROPERTY: header-args :cache t
 #+PROPERTY: header-args :padline no
-#+PROPERTY: header-args :mkdirp yes
+#+PROPERTY: header-args :mkdirp t
 #+PROPERTY: header-args :comments no
-#+PROPERTY: header-args :replace yes
+#+PROPERTY: header-args :replace t
 #+PROPERTY: header-args :tangle-mode (identity #o755)
 
 ~/bin files and other shenanigans
@@ -1006,7 +1006,7 @@ foreach my $input (@ARGV){
 
 More for nix on macos, but just merges NixOS/nipkgs origin/master to the current branch in a tmux window and watches it.
 
-#+BEGIN_SRC sh :padline no :tangle (tangle/file "bin/nix-update" (bound-and-true-p nix-p))
+#+BEGIN_SRC sh :padline no :tangle (tangle/file "bin/nix-update" (bound-and-true-p nix-p)) :mkdirp t
   #!/usr/bin/env sh
   #-*-mode: Shell-script; coding: utf-8;-*-
   # File: tmux-nix.sh
diff --git a/emacs.org b/emacs.org
index 82f1258..b181c74 100644
--- a/emacs.org
+++ b/emacs.org
@@ -311,6 +311,33 @@ Typing out *yes* or *no* is stupid.
   (fset 'yes-or-no-p 'y-or-n-p)
 #+END_SRC
 
+Disable the stupid prompt added in 23.2 that asks if you want to kill a buffer with a process attached. Yes, obviously, shut up and do it.
+
+#+BEGIN_SRC emacs-lisp
+  (setq kill-buffer-query-functions
+    (remq 'process-kill-buffer-query-function
+           kill-buffer-query-functions))
+#+END_SRC
+
+TESTING tooltip mode
+
+Puts all tooltips in the echo arear.
+
+#+BEGIN_SRC emacs-lisp
+  (tooltip-mode -1)
+  (custom-set-variables
+    '(tooltip-use-echo-area t))
+#+END_SRC
+
+TESTING redisplay
+
+Have emacs not redraw the display before processing input events.
+
+#+BEGIN_SRC emacs-lisp
+  (custom-set-variables
+    '(redisplay-dont-pause t))
+#+END_SRC
+
 *** osx specific
 
 **** no yes-or-no gui windows
diff --git a/git.org b/git.org
index 47ca88b..1bdd1ca 100644
--- a/git.org
+++ b/git.org
@@ -13,6 +13,9 @@ General git configuration split out into sections mostly.
 
 * ~/.gitconfig
 ** pager
+
+All pager, all the time.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [pager]
     color = true
@@ -38,6 +41,9 @@ General git configuration split out into sections mostly.
     new = green reverse
 #+END_SRC
 ** alias
+
+Aliases so I can be lay zee.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
     [alias]
       begin = !git init && git commit --allow-empty -m 'Initial empty commit'
@@ -103,42 +109,67 @@ General git configuration split out into sections mostly.
       nopush = remote set-url --push origin no_push
 #+END_SRC
 ** github
+
+My username for github.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [github]
     user = mitchty
 #+END_SRC
 ** credential
+
+Use a gpg encrypted .netrc file.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [credential]
     helper = netrc -v -f ~/.netrc.gpg -f ~/.netrc
 #+END_SRC
 ** advice
+
+Shut up already, I don't need hints.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [advice]
     statushints = false
 #+END_SRC
 ** gui
+
+If I ever use the stupid gui, make it a little less derp.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [gui]
     fontui = -family Monaco -size 8 -weight normal -slant roman -underline 0 -overstrike 0
     fontdiff = -family Monaco -size 8 -weight normal -slant roman -underline 0 -overstrike 0
 #+END_SRC
 ** http
+
+Make large git repos work better by increasing the post buffer.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [http]
     postBuffer = 209715200
 #+END_SRC
 ** push
+
+Forgot why this was here, some version git changed the default push behavior.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [push]
     default = simple
 #+END_SRC
 ** url rewrites
+
+Don't use git:// (ssh) to connect to github.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [url "https://github.com/"]
     insteadOf = git://github.com/
 #+END_SRC
+
 ** username/email
+
+Default username and email to use if not overridden.
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [user]
     name = Mitch Tishmack
@@ -167,8 +198,17 @@ Common crap/build artifacts that git should always ignore.
 
 * Cray overrides
 ** ~/.gitconfig
-#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (and (bound-and-true-p git-p) (bound-and-true-p cray-p)))
-[user]
-  name = Mitch Tishmack
-  email = mtishmack@cray.com
+#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig-cray" (and (bound-and-true-p git-p) (bound-and-true-p cray-p)))
+  [user]
+    name = Mitch Tishmack
+    email = mtishmack@cray.com
+#+END_SRC
+
+** includes
+
+By paths, adjust what username/email gets used. Git 2.13+ only.
+
+#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
+  [includeIf "gitdir:~/src/stash.us.cray.com"]
+    path = ~/.gitconfig-cray
 #+END_SRC