diff options
| author |  Andreas Heiduk <asheiduk@gmail.com> | 2017-04-11 16:39:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-04-13 16:15:25 -0700 |
| commit | 47242cd1037483896bb2b042e6a02c66b65b07d6 (patch) | |
| tree | d2dedd59f558f3aa70238ed426eee64993d3959c /Documentation/git-diff.txt | |
| parent | Prepare for 2.12.3 (diff) | |
| download | tgif-47242cd1037483896bb2b042e6a02c66b65b07d6.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index bbab35fcaf..b0c1bb95c8 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -97,6 +97,20 @@ 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 detailed 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 |