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/am.c | |
parent | 6a65bdcc8c610b31fff6a171e6f49045c3980027 (diff) | |
parent | a97262c62f1a31fcc7edf7629d313058bc7d66b5 (diff) |
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/am.c')
-rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index de235cf11a..95decc6a59 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1657,7 +1657,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa init_revisions(&rev_info, NULL); rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS; - diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1); + diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix); add_pending_sha1(&rev_info, "HEAD", our_tree, 0); diff_setup_done(&rev_info.diffopt); run_diff_index(&rev_info, 1); |