Merge branch 'maint'

* maint:
  t/perf: add "trash directory" to .gitignore
  Add missing -z to git check-attr usage text for consistency with man page
  git-jump: ignore (custom) prefix in diff mode
  Documentation: indent-with-non-tab uses "equivalent tabs" not 8
  completion: add --no-edit to git-commit

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/check-attr.c
index e1ff575daac8e1c12706c9555efcea0238cb7e64,9000c2db513aa20c16de7c891fd3549c6f49e398..075d01d30c58d40abb48ff820ba6f8d310f785d0
--- 1/builtin/check-attr.c
--- 2/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@@ -8,8 -8,8 +8,8 @@@ static int all_attrs
  static int cached_attrs;
  static int stdin_paths;
  static const char * const check_attr_usage[] = {
 -"git check-attr [-a | --all | attr...] [--] pathname...",
 -"git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>",
 +N_("git check-attr [-a | --all | attr...] [--] pathname..."),
- N_("git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"),
++N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
  NULL
  };
  

diff --cc contrib/completion/git-completion.bash
Simple merge