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 /t | |
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
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 50f5cc1..982eb8e 100644 --- a/t/perf/.gitignore +++ b/t/perf/.gitignore @@ -1,2 +1,3 @@ -build/ -test-results/ +/build/ +/test-results/ +/trash directory*/ |