diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-17 22:59:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 22:59:34 (GMT) |
| commit | b61f55be0060ab47b154d979f919dd969f29d314 (patch) | |
| tree | 3566700e4b8f8d992d9e599b7a933473a3139ea9 | |
| parent | 26f4f2c74e2632b708ba3dd4ae2e69d359878ccd (diff) | |
| parent | 5805853f228acafe1d45edeef780cd1b00b952aa (diff) | |
| download | git-b61f55be0060ab47b154d979f919dd969f29d314.zip git-b61f55be0060ab47b154d979f919dd969f29d314.tar.gz git-b61f55be0060ab47b154d979f919dd969f29d314.tar.bz2 | |
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.txt | 5 | ||||
| -rw-r--r-- | builtin/check-attr.c | 2 | ||||
| -rw-r--r-- | contrib/completion/git-completion.bash | 3 | ||||
| -rwxr-xr-x | contrib/git-jump/git-jump | 4 | ||||
| -rw-r--r-- | t/perf/.gitignore | 5 |
5 files changed, 11 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6416cae..11f320b 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 e1ff575..075d01d 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 1b43329..be800e0 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 a33674e..dc90cd6 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 50f5cc1..982eb8e 100644 --- a/t/perf/.gitignore +++ b/t/perf/.gitignore @@ -1,2 +1,3 @@ -build/ -test-results/ +/build/ +/test-results/ +/trash directory*/ |