summaryrefslogtreecommitdiff
path: root/t/t4013
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-03 22:56:59 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-03 22:56:59 -0700
commite2b1accc59ab5d682d71fd801ebe959c3e871488 (patch)
treefe7ff753798566ed54d2ac8af556ccc58cb4f471 /t/t4013
parentf6b78c6eb626d477b252d39ef2801d4670675a2b (diff)
parented5f07a6fdc5653e24a5bd6c216d12bc878496bd (diff)
downloadgit-e2b1accc59ab5d682d71fd801ebe959c3e871488.tar.gz
Merge branch 'maint'
* maint: Document -<n> for git-format-patch glossary: add 'reflog' diff --no-index: fix --name-status with added files Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
Diffstat (limited to 't/t4013')
-rw-r--r--t/t4013/diff.diff_--name-status_dir2_dir3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--name-status_dir2_dir b/t/t4013/diff.diff_--name-status_dir2_dir
new file mode 100644
index 0000000000..ef7fdb7335
--- /dev/null
+++ b/t/t4013/diff.diff_--name-status_dir2_dir
@@ -0,0 +1,3 @@
+$ git diff --name-status dir2 dir
+A dir/sub
+$