git-diff understands "--ours", "--theirs" and "--base" for files with
conflicts. But so far they were not documented for the central diff
command but only for diff-files.
Signed-off-by: Andreas Heiduk <ashei...@gmail.com>
---
Documentation/git-diff.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index bbab35f..91ced4f 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -97,6 +97,14 @@ OPTIONS
:git-diff: 1
include::diff-options.txt[]
+-1 --base::
+-2 --ours::
+-3 --theirs::
+-0::
+ Diff against the "base" version, "our branch" or "their
+ branch" respectively. The option -0 can be given to omit diff
+ output for unmerged entries and just show "Unmerged".
+
<path>...::
The <paths> parameters, when given, are used to limit
the diff to the named paths (you can give directory
--
2.7.4
