| commit | 02dab5d399fb276f91646d7780da90596bffefab | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:15 +0000 (5 14:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:15 +0000 (5 14:54 -0800) | ||
| tree | 29b03cb0e3c0a2111307903c4cf1ba9d895c25d3 | treesnapshot (tar.gz zip) |
| parent | 6a65bdcc8c610b31fff6a171e6f49045c3980027 | commitdiff |
| parent | a97262c62f1a31fcc7edf7629d313058bc7d66b5 | commitdiff |
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
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