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-read-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-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 3206531853..1c48c28996 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -26,14 +26,14 @@ flag. When used with `-m`, the `-u` flag causes it to also update the files in the work tree with the result of the merge. Only trivial merges are done by 'git read-tree' itself. Only conflicting paths -will be in unmerged state when 'git read-tree' returns. +will be in an unmerged state when 'git read-tree' returns. OPTIONS ------- -m:: Perform a merge, not just a read. The command will refuse to run if your index file has unmerged entries, - indicating that you have not finished previous merge you + indicating that you have not finished a previous merge you started. --reset:: |