From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:16:04 +0000 (-0800)
Subject: Merge branch 'nd/diff-with-path-params'
X-Git-Tag: v2.8.0-rc0~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a;p=git

Merge branch 'nd/diff-with-path-params'

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

c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a