Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 09:45:18 +0300
committerJunio C Hamano <gitster@pobox.com>2023-10-09 22:06:29 +0300
commitf22fdf33aff48def873eed9f5d30abf9fc0d8700 (patch)
tree5c3e5825196f34d16adb031a16fcf42df0fff4e8 /Documentation/git-merge-base.txt
parent0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6 (diff)
documentation: remove unnecessary hyphens
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 463764b9c1..5cdcb5663c 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -130,7 +130,7 @@ When the history involves criss-cross merges, there can be more than one
---2---o---o---B
....
-both '1' and '2' are merge-bases of A and B. Neither one is better than
+both '1' and '2' are merge bases of A and B. Neither one is better than
the other (both are 'best' merge bases). When the `--all` option is not given,
it is unspecified which best one is output.