undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2012-09-17 15:59:34 -07:00
commit b61f55be00
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/config.txt
View File

@ -559,8 +559,9 @@ core.whitespace::
* `space-before-tab` treats a space character that appears immediately * `space-before-tab` treats a space character that appears immediately
before a tab character in the initial indent part of the line as an before a tab character in the initial indent part of the line as an
error (enabled by default). error (enabled by default).
* `indent-with-non-tab` treats a line that is indented with 8 or more * `indent-with-non-tab` treats a line that is indented with space
space characters as an error (not enabled by default). 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 * `tab-in-indent` treats a tab character in the initial indent part of
the line as an error (not enabled by default). the line as an error (not enabled by default).
* `blank-at-eof` treats blank lines added at the end of file as an error * `blank-at-eof` treats blank lines added at the end of file as an error

2
builtin/check-attr.c
View File

@ -9,7 +9,7 @@ static int cached_attrs;
static int stdin_paths; static int stdin_paths;
static const char * const check_attr_usage[] = { static const char * const check_attr_usage[] = {
N_("git check-attr [-a | --all | attr...] [--] pathname..."), 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 NULL
}; };

3
contrib/completion/git-completion.bash
View File

@ -1018,7 +1018,8 @@ _git_commit ()
--*) --*)
__gitcomp " __gitcomp "
--all --author= --signoff --verify --no-verify --all --author= --signoff --verify --no-verify
--edit --amend --include --only --interactive --edit --no-edit
--amend --include --only --interactive
--dry-run --reuse-message= --reedit-message= --dry-run --reuse-message= --reedit-message=
--reset-author --file= --message= --template= --reset-author --file= --message= --template=
--cleanup= --untracked-files --untracked-files= --cleanup= --untracked-files --untracked-files=

4
contrib/git-jump/git-jump
View File

@ -21,9 +21,9 @@ open_editor() {
} }
mode_diff() { mode_diff() {
git diff --relative "$@" | git diff --no-prefix --relative "$@" |
perl -ne ' perl -ne '
if (m{^\+\+\+ b/(.*)}) { $file = $1; next } if (m{^\+\+\+ (.*)}) { $file = $1; next }
defined($file) or next; defined($file) or next;
if (m/^@@ .*\+(\d+)/) { $line = $1; next } if (m/^@@ .*\+(\d+)/) { $line = $1; next }
defined($line) or next; defined($line) or next;

5
t/perf/.gitignore vendored
View File

@ -1,2 +1,3 @@
build/ /build/
test-results/ /test-results/
/trash directory*/