summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:38:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:38:48 (GMT)
commited47bbd1d05ce7f78a52639e1b1fb522b975b066 (patch)
treef34673c4d03b285bd8d4ffc5555c2e98fb757141 /Documentation/git-read-tree.txt
parentaa4bffa23599e0c2e611be7012ecb5f596ef88b5 (diff)
parent06ab60c06606613f238f3154cb27cb22d9723967 (diff)
downloadgit-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.zip
git-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.tar.gz
git-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.tar.bz2
Merge branch 'jj/command-line-adjective'
* jj/command-line-adjective: Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 056c0db..fa1d557 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: