diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 08:45:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 21:06:44 +0200 |
| commit | 4d542687fcea27c6cce9a79415ad8cb1a817697c (patch) | |
| tree | e72600a6fffb78f19714ea08ea4212cedf0c1258 /Documentation/git-merge-base.txt | |
| parent | documentation: fix whitespace issues (diff) | |
| download | git-4d542687fcea27c6cce9a79415ad8cb1a817697c.tar.xz git-4d542687fcea27c6cce9a79415ad8cb1a817697c.zip | |
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-merge-base.txt')
| -rw-r--r-- | Documentation/git-merge-base.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index cbc77f7258..5ab957cfbc 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -88,7 +88,7 @@ For example, with this topology: the merge base between 'A' and 'B' is '1'. -Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the +Given three commits 'A', 'B', and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology: @@ -204,7 +204,7 @@ will find B0, and $ git rebase --onto origin/master $fork_point topic -will replay D0, D1 and D on top of B to create a new history of this +will replay D0, D1, and D on top of B to create a new history of this shape: .... |