From 4195acc0125c779b8d2b105904255d3e55d6885c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 5 Jul 2023 15:05:23 -0400 Subject: [PATCH] remove redundant example The paragraph just above already shows how to configure .gitattributes and the necessary git config. So this is redundant. Also, it makes .gitattributes match *, which is likely not a good idea because those files are not likely to be all text files. --- doc/git-annex-diffdriver.mdwn | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/doc/git-annex-diffdriver.mdwn b/doc/git-annex-diffdriver.mdwn index a90a5fc606..f0915b0de2 100644 --- a/doc/git-annex-diffdriver.mdwn +++ b/doc/git-annex-diffdriver.mdwn @@ -21,16 +21,6 @@ If some of your annexed files are textual in form, and can be usefully diffed with diff(1), you can configure git to use this command to diff them, by configuring `.gitattributes` to contain eg `*.txt diff=annextextdiff` and setting `git config diff.annextextdiff.command "git annex diffdriver --text"`. -The following can thus be used to configure `git diff` (only in your local -repository) to operate on the contents of annexed files: - -```sh -echo '* diff=annextextdiff' >> .git/info/attributes -git config diff.annextextdiff.command "git annex diffdriver --text" -``` - -Note, however, that this will change the diff mechanism for *all* tracked files, -so `git diff` might look a little different than normal. If your annexed files are not textual in form, you will need an external diff driver program that is able to diff the file format(s) you use. -- 2.30.2