diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6 (patch) | |
| tree | 6c5654ff388c603eb020df9d8b4cd7acc2b3b862 /Documentation/git-merge-tree.txt | |
| parent | 3771d002571f6fc796ff3f54e9d5b875826e62ed (diff) | |
| download | git-0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6.tar.gz | |
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-tree.txt')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 9f951c7fe3..b50acace3b 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -19,7 +19,7 @@ DESCRIPTION This command has a modern `--write-tree` mode and a deprecated `--trivial-merge` mode. With the exception of the <<DEPMERGE,DEPRECATED DESCRIPTION>> section at the end, the rest of -this documentation describes modern `--write-tree` mode. +this documentation describes the modern `--write-tree` mode. Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index. |