From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Sep 2013 18:42:44 +0000 (-0700)
Subject: Merge branch 'dw/diff-no-index-doc'
X-Git-Tag: v1.8.5-rc0~124
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd8c891b7403754cc7f4b5ace0f799adb83d3218

Merge branch 'dw/diff-no-index-doc'

When the user types "git diff" outside a working tree, thinking he
is inside one, the current error message that is a single-liner
"usage: git diff --no-index <path> <path>" may not be sufficient to
make him realize the mistake. Add "Not a git repository" to the
error message when we fell into the "--no-index" mode without an
explicit command line option to instruct us to do so.

* dw/diff-no-index-doc:
diff --no-index: describe in a separate paragraph
diff --no-index: clarify operation when not inside a repository
---

cd8c891b7403754cc7f4b5ace0f799adb83d3218