mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

documentation: add some commas where they are helpful

Browse Source 
Diff best viewed with --color-diff.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2023-10-08 06:45:24 +00:00
committed by Junio C Hamano
parent 42bdb80a08
commit 4d542687fc
37 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-diff-files.txt
View File

@ -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.