summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2009-04-16 03:17:12 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-17 21:28:07 -0700
commitc4c86d238900fb8c99939a9b5003fa622d4dcce7 (patch)
tree68fcc11851a406958d6097b412c3a6d62d3211f9 /merge-recursive.c
parentMerge branch 'maint-1.6.1' into maint (diff)
downloadtgif-c4c86d238900fb8c99939a9b5003fa622d4dcce7.tar.xz
doc/gitattributes: clarify location of config text
The gitattributes documentation has a section on the "diff" attribute, with subsections for each of the things you might want to configure in your diff config section (external diff, hunk headers, etc). The first such subsection specifically notes that the definition of the diff driver should go into $GIT_DIR/config, but subsequent sections do not. This location is implied if you are reading the documentation sequentially, but it is not uncommon for a new user to jump to (or be referred to) a specific section. For a new user who does not know git well enough to recognize the config syntax, it is not clear that those directives don't also go into the gitattributes file. This patch just mentions the config file in each subsection, similar to the way it is mentioned in the first. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions