summaryrefslogtreecommitdiff
path: root/t/t4013
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-18 11:31:52 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-18 11:31:52 -0800
commit25487f8e2ae266936df0f807ae79dca41606e404 (patch)
treedcea5cb274c0618e742644b5cd7b0615202819b7 /t/t4013
parent88e38808cd52aaed327a82d6a6ffdb8b9da621f2 (diff)
parent91e80b984e0afda37d288e550fb5832d2b71568c (diff)
downloadgit-25487f8e2ae266936df0f807ae79dca41606e404.tar.gz
Merge branch 'maint'
* maint: tests: fix "export var=val" Skip timestamp differences for diff --no-index Documentation/git-push: --all, --mirror, --tags can not be combined
Diffstat (limited to 't/t4013')
-rw-r--r--t/t4013/diff.diff_--no-index_dir_dir32
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--no-index_dir_dir3 b/t/t4013/diff.diff_--no-index_dir_dir3
new file mode 100644
index 0000000000..2142c2b9ad
--- /dev/null
+++ b/t/t4013/diff.diff_--no-index_dir_dir3
@@ -0,0 +1,2 @@
+$ git diff --no-index dir dir3
+$