> "git diff --uncached" invokes the GIT_EXTERNAL_DIFF variable with just one
quoted text
> argument (instead of 7 arguments, as documented) in a particular situation:

You are looking at an unmerged path.

    'GIT_EXTERNAL_DIFF'::
            When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
            program named by it is called, instead of the diff invocation
            described above.  For a path that is added, removed, or modified,
            'GIT_EXTERNAL_DIFF' is called with 7 parameters:

    ...
    +
    For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
    parameter, <path>.

The script needs to decide how it wants to present an unmerged
path; the information on each unmerged stages can be read from
the output of "ls-files -u $thatpath".


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html