summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-28 15:17:18 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-28 15:17:18 -0700
commit286bc123cdabed76a1da25a32e97d392b37d51a2 (patch)
tree8a2e0b5ac593780ed6c5555f93eeb692304271d6 /merge-recursive.c
parentb214eddfb2d57e318a3f5b88da1cafcf19184b4d (diff)
downloadgit-286bc123cdabed76a1da25a32e97d392b37d51a2.tar.gz
diff --no-index: describe in a separate paragraphdw/diff-no-index-doc
The documentation for "diff-files" mode of "git diff" primarily talks about how changes in the files in the working tree are shown relative to the contents previously added to that index, and tucks explanation on how "--no-index" mode, which works in a quite different way, may be implicitly used instead. Instead, add a separate paragraph to explain what "--no-index" mode does, and also mention when "--no-index" can be omitted from the command line (essentially, when it is obvious from the context). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions