diff options
| author | Jason St. John <jstjohn@purdue.edu> | 2014-05-21 14:52:26 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-21 13:57:10 -0700 |
| commit | 06ab60c06606613f238f3154cb27cb22d9723967 (patch) | |
| tree | 851407afe91f051cdb3428b944e8179e1b39f04b /Documentation/git-read-tree.txt | |
| parent | 8ced8e40ac07c1b13b2edbb459d37b9b2d7275d6 (diff) | |
| download | git-06ab60c06606613f238f3154cb27cb22d9723967.tar.gz | |
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
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 056c0dba81..fa1d557e5b 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -283,7 +283,7 @@ merge. The different stages represent the "result tree" (stage 0, aka you are trying to merge (stage 2 and 3 respectively). The order of stages 1, 2 and 3 (hence the order of three -<tree-ish> command line arguments) are significant when you +<tree-ish> command-line arguments) are significant when you start a 3-way merge with an index file that is already populated. Here is an outline of how the algorithm works: |