From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2012 22:59:34 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.0-rc0~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b61f55be0060ab47b154d979f919dd969f29d314;p=git.git

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
---

b61f55be0060ab47b154d979f919dd969f29d314
diff --cc builtin/check-attr.c
index e1ff575da,9000c2db5..075d01d30
--- a/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
  };