diff-files: document --ours etc.
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 <asheiduk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andreas Heiduk committed
Apr 11, 2017 at 16:39 UTC
47242cd1037483896bb2b042e6a02c66b65b07d6
1 file changed
+14
Documentation/git-diff.txt
+14
@@ -97,6 +97,20 @@ OPTIONS
97
:git-diff: 1
98
include::diff-options.txt[]
99
100
+-1 --base::
101
+-2 --ours::
102
+-3 --theirs::
103
+ Compare the working tree with the "base" version (stage #1),
104
+ "our branch" (stage #2) or "their branch" (stage #3). The
105
+ index contains these stages only for unmerged entries i.e.
106
+ while resolving conflicts. See linkgit:git-read-tree[1]
107
+ section "3-Way Merge" for detailed information.
108
+
109
+-0::
110
+ Omit diff output for unmerged entries and just show
111
+ "Unmerged". Can be used only when comparing the working tree
112
+ with the index.
113
+
114
<path>...::
115
The <paths> parameters, when given, are used to limit
116
the diff to the named paths (you can give directory