mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove redundant example

Browse source 
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.
This commit is contained in:
Joey Hess 2023-07-05 15:05:23 -04:00
parent b90d9aa990
commit 4195acc012
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/git-annex-diffdriver.mdwn
View file

@ -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.