Merge remote-tracking branch 'staging'

* staging:
  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.

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 2bbe46482054ca90bd6f2756ae1f07dc1bb85dad..0bc63d1c87e3f36861973d3a09557ae7fc96f6ad 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -46,6 +46,9 @@
 
 [format]
        headers = "Organization: Straylight/Edgeware\n"
+       coverletter = auto
+       thread = shallow
+       signature = "[mdw]"
 
 [color]
        ui = auto
@@ -85,7 +88,7 @@
 
 [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 @@
        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 @@
        aliasesfile = @profile@/dot/mailrc
        aliasfiletype = mailrc
        chainreplyto = no
+       thread = no
        signedoffbycc = yes
        suppresscc = self
 

diff --git a/git/gitignore b/git/gitignore
index b41e9346f4ab195bf3e72bffa4da7e8421d3e171..e25ff118f2d49c12f519692bd1f38e98f87e5711 100644 (file)
--- a/git/gitignore
+++ b/git/gitignore
@@ -23,8 +23,8 @@ GTAGS
 .gdb_history
 
 ## Build and release directories.
-build
-build-*
-build.*
-dist-*
-deb-build
+/build/
+/build.*/
+/dist-*/
+/p/
+/p.*/