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

Add --text example to diffdriver man page

Browse source
This commit is contained in:
Yann Büchau 2023-07-03 13:19:45 +02:00
parent 381e7b9bce
commit 8baced5a7b
No known key found for this signature in database
GPG key ID: 08E472451E1F9E32
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,17 @@ or as a shim that runs an external git diff driver.
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"`
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.