diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2020-09-20 23:22:31 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-20 21:29:02 -0700 |
commit | 087c61677c358091692ac6ce1de00bbfc9affdb1 (patch) | |
tree | cd90ca724ddfe7e796fb29db42ef578f26318035 /interdiff.h | |
parent | docs: explain why reverts are not always applied on merge (diff) | |
download | tgif-087c61677c358091692ac6ce1de00bbfc9affdb1.tar.xz |
docs: explain how to deal with files that are always modified
Users frequently have problems where two filenames differ only in case,
causing one of those files to show up consistently as being modified.
Let's add a FAQ entry that explains how to deal with that.
In addition, let's explain another common case where files are
consistently modified, which is when files using a smudge or clean
filter have not been run through that filter. Explain the way to fix
this as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'interdiff.h')
0 files changed, 0 insertions, 0 deletions