diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:44 -0700 |
| commit | 4d542687fcea27c6cce9a79415ad8cb1a817697c (patch) | |
| tree | e72600a6fffb78f19714ea08ea4212cedf0c1258 /Documentation/git-diff-files.txt | |
| parent | 42bdb80a084f1405f2e57394146c977ad4f3b75a (diff) | |
| download | git-4d542687fcea27c6cce9a79415ad8cb1a817697c.tar.gz | |
documentation: add some commas where they are helpful
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-files.txt')
| -rw-r--r-- | Documentation/git-diff-files.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 18f7f86bef..bf78e31431 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -26,7 +26,7 @@ include::diff-options.txt[] -2 --ours:: -3 --theirs:: -0:: - Diff against the "base" version, "our branch" or "their + Diff against the "base" version, "our branch", or "their branch" respectively. With these options, diffs for merged entries are not shown. + @@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show "Unmerged". -c:: --cc:: This compares stage 2 (our branch), stage 3 (their - branch) and the working tree file and outputs a combined + branch), and the working tree file and outputs a combined diff, similar to the way 'diff-tree' shows a merge commit with these flags. |