2015-03-25 16:09:49 +00:00
|
|
|
# NAME
|
|
|
|
|
|
|
|
git-annex diffdriver - external git diff driver shim
|
|
|
|
|
|
|
|
# SYNOPSIS
|
|
|
|
|
|
|
|
git annex diffdriver `-- cmd --opts --`
|
|
|
|
|
|
|
|
# DESCRIPTION
|
|
|
|
|
|
|
|
This is an external git diff driver shim. Normally, when using `git diff`
|
2018-02-06 17:45:14 +00:00
|
|
|
with an external diff driver, the symlinks to annexed files are not set up
|
|
|
|
right, so the external diff driver cannot read them in order to perform
|
2015-03-25 16:09:49 +00:00
|
|
|
smart diffing of their contents. This command works around the problem,
|
|
|
|
by passing the fixed up files to the real external diff driver.
|
|
|
|
|
2018-02-06 17:45:14 +00:00
|
|
|
To use this, you will need to have installed some git external diff driver
|
|
|
|
command. This is not the regular diff command; it takes a git-specific
|
|
|
|
input. See git's documentation of `GIT_EXTERNAL_DIFF` and
|
|
|
|
gitattributes(5)'s documentation of external diff drivers.
|
|
|
|
|
|
|
|
Configure git to use "git-annex diffdriver -- cmd params --"
|
|
|
|
as the external diff driver, where cmd is the external diff
|
|
|
|
driver you want it to run, and params are any extra parameters to pass
|
2015-03-25 16:09:49 +00:00
|
|
|
to it. Note the trailing "--", which is required.
|
|
|
|
|
|
|
|
For example, set `GIT_EXTERNAL_DIFF=git-annex diffdriver -- j-c-diff --`
|
|
|
|
|
|
|
|
# SEE ALSO
|
|
|
|
|
|
|
|
[[git-annex]](1)
|
|
|
|
|
|
|
|
# AUTHOR
|
|
|
|
|
|
|
|
Joey Hess <id@joeyh.name>
|
|
|
|
|
|
|
|
Warning: Automatically converted into a man page by mdwn2man. Edit with care.
|