diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
| commit | 02dab5d399fb276f91646d7780da90596bffefab (patch) | |
| tree | 29b03cb0e3c0a2111307903c4cf1ba9d895c25d3 /builtin/diff.c | |
| parent | 6a65bdcc8c610b31fff6a171e6f49045c3980027 (diff) | |
| parent | a97262c62f1a31fcc7edf7629d313058bc7d66b5 (diff) | |
| download | git-02dab5d399fb276f91646d7780da90596bffefab.tar.gz git-02dab5d399fb276f91646d7780da90596bffefab.tar.xz | |
Merge branch 'nd/diff-with-path-params' into maint
A few options of "git diff" did not work well when the command was
run from a subdirectory.
* nd/diff-with-path-params:
diff: make -O and --output work in subdirectory
diff-no-index: do not take a redundant prefix argument
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index ed0acca91..52c98a921 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -341,7 +341,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) } if (no_index) /* If this is a no-index diff, just run it and exit there. */ - diff_no_index(&rev, argc, argv, prefix); + diff_no_index(&rev, argc, argv); /* Otherwise, we are doing the usual "git" diff */ rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index; |