diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:44 -0700 |
| commit | cd8c891b7403754cc7f4b5ace0f799adb83d3218 (patch) | |
| tree | 6e2e6b048303471b81b45647043d1e995b690314 /merge-recursive.c | |
| parent | 8fbb07e3f37ab53febd0b2fc0f64811c68cd2492 (diff) | |
| parent | 286bc123cdabed76a1da25a32e97d392b37d51a2 (diff) | |
| download | git-cd8c891b7403754cc7f4b5ace0f799adb83d3218.tar.gz | |
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions