diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:59:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:59:34 -0700 |
| commit | b61f55be0060ab47b154d979f919dd969f29d314 (patch) | |
| tree | 3566700e4b8f8d992d9e599b7a933473a3139ea9 /t | |
| parent | Merge branch 'mh/fetch-filter-refs' (diff) | |
| parent | t/perf: add "trash directory" to .gitignore (diff) | |
| download | tgif-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
Diffstat (limited to 't')
| -rw-r--r-- | t/perf/.gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/perf/.gitignore b/t/perf/.gitignore index 50f5cc1ed9..982eb8e3a9 100644 --- a/t/perf/.gitignore +++ b/t/perf/.gitignore @@ -1,2 +1,3 @@ -build/ -test-results/ +/build/ +/test-results/ +/trash directory*/ |