From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Feb 2016 22:54:15 +0000 (-0800)
Subject: Merge branch 'nd/diff-with-path-params' into maint
X-Git-Tag: v2.7.1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02dab5d399fb276f91646d7780da90596bffefab;p=thirdparty%2Fgit.git

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
---

02dab5d399fb276f91646d7780da90596bffefab