diff-files: -1/-2/-3 to diff against unmerged stage.

[git.git] / Documentation / git-diff-files.txt

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 3b04bfe..b45d1e6 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -21,6 +21,16 @@ OPTIONS
 -------
 include::diff-options.txt[]
 
+-1 -2 -3 or --base --ours --theirs, and -0::
+       Diff against the "base" version, "our branch" or "their
+       branch" respectively.  With these options, diffs for
+       merged entries are not shown.
++
+The default is to diff against our branch (-2) if there
+is an unmerged path, and show diff for unmerged entries
+otherwise.  The option -0 can be given to force diff for
+unmerged entries even when the index is unmerged.
+
 -q::
        Remain silent even on nonexisting files