diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 08:45:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 21:06:29 +0200 |
| commit | 0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6 (patch) | |
| tree | 6c5654ff388c603eb020df9d8b4cd7acc2b3b862 /Documentation/git-merge-base.txt | |
| parent | documentation: fix choice of article (diff) | |
| download | git-0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6.tar.xz git-0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6.zip | |
documentation: add missing article
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index b01ba3d356..463764b9c1 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -18,7 +18,7 @@ SYNOPSIS DESCRIPTION ----------- -'git merge-base' finds best common ancestor(s) between two commits to use +'git merge-base' finds the best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is 'better' than another common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a 'best common |