diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:16 -0700 |
| commit | 7203bafa88ff0a4f8702b0eee38bc36d7e542a81 (patch) | |
| tree | 56df1189eed5ed0464d2d98c8ff6ae42e992ac54 /Documentation | |
| parent | 74a74beee9676a21c089f569b75d386398a4867b (diff) | |
| parent | 47242cd1037483896bb2b042e6a02c66b65b07d6 (diff) | |
| download | git-7203bafa88ff0a4f8702b0eee38bc36d7e542a81.tar.gz git-7203bafa88ff0a4f8702b0eee38bc36d7e542a81.tar.xz | |
Merge branch 'ah/diff-files-ours-theirs-doc'
The diff options "--ours", "--theirs" exist for quite some time.
But so far they were not documented. Now they are.
* ah/diff-files-ours-theirs-doc:
diff-files: document --ours etc.
Diffstat (limited to 'Documentation')
| -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 bbab35fca..b0c1bb95c 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 |