diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-29 23:11:22 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-29 23:11:22 -0800 |
commit | 44148f2daf6e1ac3fe087dd07da2930411b3bcf2 (patch) | |
tree | dd8fa69cd7023f8cb1f4fd517701272fcb6e4f94 /builtin-diff-tree.c | |
parent | ed87465658c83a5a1617920e7b605bd830a78aed (diff) | |
parent | 66abce05dd5b9da9c889034781dc3de38b6e231b (diff) | |
download | git-44148f2daf6e1ac3fe087dd07da2930411b3bcf2.tar.gz |
Merge remote branch 'ko/master' into HEAD
* ko/master: (366 commits)
Update draft release notes to 1.6.6 before merging topics for -rc1
Makefile: do not clean arm directory
Add a notice that only certain functions can print color escape codes
builtin-apply.c: pay attention to -p<n> when determining the name
gitworkflows: Consistently back-quote git commands
Explicitly truncate bswap operand to uint32_t
t1200: fix a timing dependent error
Documentation: update descriptions of revision options related to '--bisect'
Enable support for IPv6 on MinGW
Refactor winsock initialization into a separate function
t/gitweb-lib: Split HTTP response with non-GNU sed
pack-objects: split implications of --all-progress from progress activation
instaweb: restart server if already running
prune-packed: only show progress when stderr is a tty
remote-curl.c: fix rpc_out()
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
strbuf_add_wrapped_text(): skip over colour codes
t4014-format-patch: do not assume 'test' is available as non-builtin
Fix over-simplified documentation for 'git log -z'
...
Diffstat (limited to 'builtin-diff-tree.c')
-rw-r--r-- | builtin-diff-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c index 79cedb72c4..2380c21951 100644 --- a/builtin-diff-tree.c +++ b/builtin-diff-tree.c @@ -104,6 +104,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ opt->abbrev = 0; opt->diff = 1; + opt->disable_stdin = 1; argc = setup_revisions(argc, argv, opt, NULL); while (--argc > 0) { |