[PATCH v1] Docs: Add some missing options to git-diff.txt
- From
Andreas Heiduk <asheiduk@gmail.com>
- Date
- Apr 10, 2017, 10:59 UTC
- Message-ID
- <20170410105907.12045-1-asheiduk@gmail.com>
- In-Reply-To
- <1490903375-2115-1-git-send-email-asheiduk@gmail.com>
Well, this wording picks up your points but I won't call it "stress it" :-) However this should do the job.
--8<------>8------ 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> --- Documentation/git-diff.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index bbab35fca..2bccf4505 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -97,6 +97,21 @@ OPTIONS :git-diff: 1 include::diff-options.txt[] +-1 --base:: +-2 --ours:: +-3 --theirs:: + Compare the working tree with the "base" version (stage #1), + "our branch" (stage #2) or "their branch" (stage #3). The + index contains these stages only for unmerged entries i.e. + while resolving conflicts. See linkgit:git-read-tree[1] + section "3-Way Merge" for more information. + +-0:: + Omit diff output for unmerged entries and just show + "Unmerged". Can be used only when comparing the working tree + with the index + + <path>...:: The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory
-- 2.12.2