diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 9a9fd289cc81a3bb69eb2b4e11db27509e0eb515 (patch) | |
| tree | 613ec5217e16120fa374f5c60cc815db770e0245 /Documentation/git-merge-base.txt | |
| parent | 0cac690e1ac5e26ecf2dba0c53ac3824425446b5 (diff) | |
| download | git-9a9fd289cc81a3bb69eb2b4e11db27509e0eb515.tar.gz | |
documentation: use clearer prepositions
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 5cdcb5663c..cbc77f7258 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -28,7 +28,7 @@ merge base for a pair of commits. OPERATION MODES --------------- -As the most common special case, specifying only two commits on the +In the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits. More generally, among the two commits to compute the merge base from, @@ -64,7 +64,7 @@ from linkgit:git-show-branch[1] when used with the `--merge-base` option. the two commits, but also takes into account the reflog of <ref> to see if the history leading to <commit> forked from an earlier incarnation of the branch <ref> (see discussion - on this mode below). + of this mode below). OPTIONS ------- |