diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:53 -0700 |
| commit | 4da8cbc234177d6a8cf749d4ef60bd05ec843898 (patch) | |
| tree | a97b17b67a77e6d9f9b7cdf0aa265594db2ddeb4 /diff-tree.c | |
| parent | b5b1442ac35706ce1e3daed407dd935f0e9dd796 (diff) | |
| parent | c4e05b1a2290c605e68e6dac5e2a580e6d4080b7 (diff) | |
| download | git-4da8cbc234177d6a8cf749d4ef60bd05ec843898.tar.gz | |
Merge branch 'jc/diff' into next
* jc/diff:
blame and friends: adjust to multiple pathspec change.
git log --full-diff
tree-diff: do not assume we use only one pathspec
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c index 2a088d11cf..2b79dd0a68 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -120,7 +120,7 @@ int main(int argc, const char **argv) if (opt->diffopt.output_format == DIFF_FORMAT_PATCH) opt->diffopt.recursive = 1; - diff_tree_setup_paths(get_pathspec(prefix, argv)); + diff_tree_setup_paths(get_pathspec(prefix, argv), opt); diff_setup_done(&opt->diffopt); switch (nr_sha1) { |