aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-17 15:59:34 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-17 15:59:34 -0700
commitb61f55be0060ab47b154d979f919dd969f29d314 (patch)
tree3566700e4b8f8d992d9e599b7a933473a3139ea9
parent26f4f2c74e2632b708ba3dd4ae2e69d359878ccd (diff)
parent5805853f228acafe1d45edeef780cd1b00b952aa (diff)
downloadgit-b61f55be0060ab47b154d979f919dd969f29d314.tar.gz
git-b61f55be0060ab47b154d979f919dd969f29d314.tar.xz
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
-rw-r--r--Documentation/config.txt5
-rw-r--r--builtin/check-attr.c2
-rw-r--r--contrib/completion/git-completion.bash3
-rwxr-xr-xcontrib/git-jump/git-jump4
-rw-r--r--t/perf/.gitignore5
5 files changed, 11 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6416cae51..11f320b96 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -559,8 +559,9 @@ core.whitespace::
* `space-before-tab` treats a space character that appears immediately
before a tab character in the initial indent part of the line as an
error (enabled by default).
-* `indent-with-non-tab` treats a line that is indented with 8 or more
- space characters as an error (not enabled by default).
+* `indent-with-non-tab` treats a line that is indented with space
+ characters instead of the equivalent tabs as an error (not enabled by
+ default).
* `tab-in-indent` treats a tab character in the initial indent part of
the line as an error (not enabled by default).
* `blank-at-eof` treats blank lines added at the end of file as an error
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index e1ff575da..075d01d30 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -9,7 +9,7 @@ static int cached_attrs;
static int stdin_paths;
static const char * const check_attr_usage[] = {
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 --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1b43329ed..be800e09b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1018,7 +1018,8 @@ _git_commit ()
--*)
__gitcomp "
--all --author= --signoff --verify --no-verify
- --edit --amend --include --only --interactive
+ --edit --no-edit
+ --amend --include --only --interactive
--dry-run --reuse-message= --reedit-message=
--reset-author --file= --message= --template=
--cleanup= --untracked-files --untracked-files=
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index a33674e47..dc90cd637 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -21,9 +21,9 @@ open_editor() {
}
mode_diff() {
- git diff --relative "$@" |
+ git diff --no-prefix --relative "$@" |
perl -ne '
- if (m{^\+\+\+ b/(.*)}) { $file = $1; next }
+ if (m{^\+\+\+ (.*)}) { $file = $1; next }
defined($file) or next;
if (m/^@@ .*\+(\d+)/) { $line = $1; next }
defined($line) or next;
diff --git a/t/perf/.gitignore b/t/perf/.gitignore
index 50f5cc1ed..982eb8e3a 100644
--- a/t/perf/.gitignore
+++ b/t/perf/.gitignore
@@ -1,2 +1,3 @@
-build/
-test-results/
+/build/
+/test-results/
+/trash directory*/