git, branch v1.7.12.1

Git 1.7.12.1

2012-09-18T21:34:31Z

Signed-off-by: Junio C Hamano

Merge branch 'er/doc-fast-import-done' into maint

2012-09-18T21:33:52Z

* er/doc-fast-import-done: fast-import: document the --done option

Merge branch 'jk/config-warn-on-inaccessible-paths' into maint

2012-09-18T21:24:06Z

The attribute system may be asked for a path that itself or its leading directories no longer exists in the working tree, and it is fine if we cannot open .gitattribute file in such a case. Failure to open per-directory .gitattributes with error status other than ENOENT and ENOTDIR should be diagnosed. * jk/config-warn-on-inaccessible-paths: attr: failure to open a .gitattributes file is OK with ENOTDIR warn_on_inaccessible(): a helper to warn on inaccessible paths attr: warn on inaccessible attribute files gitignore: report access errors of exclude files config: warn on inaccessible files

Doc: Improve shallow depth wording

2012-09-18T20:35:56Z

Avoid confusion in compound sentence about the start of the commit set and the depth measure. Use two sentences. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano

Documentation/git-filter-branch: Move note about effect of removing commits

2012-09-18T19:51:58Z

The note that explains that changes introduced by removed commits are preserved should be placed directly after the paragraph that describes such commits removal. Otherwise the reference to "the commits" appears out of context. Also the big example that follows "Consider this history" is about rewriting part of the history DAG. Move the paragraph that describes the operation close to it. Signed-off-by: Andreas Schwab Signed-off-by: Junio C Hamano

t/perf: add "trash directory" to .gitignore

2012-09-17T21:27:55Z

Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

Add missing -z to git check-attr usage text for consistency with man page

2012-09-17T20:45:32Z

Signed-off-by: Adam Spiers Signed-off-by: Junio C Hamano

git-jump: ignore (custom) prefix in diff mode

2012-09-17T19:31:57Z

Matching the default file prefix b/ does not yield any results if config option diff.noprefix or diff.mnemonicprefix is enabled. Signed-off-by: Mischa POSLAWSKY Acked-by: Jeff King Signed-off-by: Junio C Hamano

Documentation: indent-with-non-tab uses "equivalent tabs" not 8

2012-09-17T17:23:21Z

Update the documentation of the core.whitespace option "indent-with-non-tab" to correctly reflect that it catches the use of spaces instead of the equivalent tabs, rather than a fixed number. Signed-off-by: Wesley J. Landaker Signed-off-by: Junio C Hamano

completion: add --no-edit to git-commit

2012-09-17T05:05:07Z

Signed-off-by: Yacine Belkadi Signed-off-by: Junio C Hamano