summaryrefslogtreecommitdiff
path: root/mergetools/meld
diff options
context:
space:
mode:
authorLibravatar Andreas Heiduk <asheiduk@gmail.com>2017-06-14 08:51:39 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-15 10:55:47 -0700
commit773a88914f7b951cb33b27b12b4b715b66451a07 (patch)
tree22531820f65dc6df0231477bc8799d745f675e5b /mergetools/meld
parentPrepare for 2.13.2 (diff)
downloadtgif-773a88914f7b951cb33b27b12b4b715b66451a07.tar.xz
doc: do not use `rm .git/index` when normalizing line endings
When illustrating how to normalize the line endings, the documentation in gitattributes tells the user to `rm .git/index`. This is incorrect for two reasons: - Users shouldn't be instructed to mess around with the internal implementation of Git using raw file system tools like `rm`. - Within a submodule or an additional working tree `.git` is just a file containing a `gitdir: <path>` pointer into the real `.git` directory. Therefore `rm .git/index` does not work. The purpose of the `rm .git/index` instruction is to remove all entries from the index without touching the working tree. The way to do this with Git is to use `read-tree --empty`. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions