diff options
author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:03 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:04:21 -0700 |
commit | cf6cac20059123d6ec3f867bb3692df62db52cf9 (patch) | |
tree | 99e0ee363183782b239257d69d28282c44100136 /Documentation/git-read-tree.txt | |
parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
download | git-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.gz |
documentation: wording improvements
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index b09707474d..3206531853 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -25,7 +25,7 @@ fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m` 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. -Trivial merges are done by 'git read-tree' itself. Only conflicting paths +Only trivial merges are done by 'git read-tree' itself. Only conflicting paths will be in unmerged state when 'git read-tree' returns. OPTIONS |