diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:48 -0700 |
| commit | ed47bbd1d05ce7f78a52639e1b1fb522b975b066 (patch) | |
| tree | f34673c4d03b285bd8d4ffc5555c2e98fb757141 /Documentation/git-read-tree.txt | |
| parent | Merge branch 'jc/coding-guidelines' (diff) | |
| parent | Documentation: use "command-line" when used as a compound adjective, and fix ... (diff) | |
| download | tgif-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.tar.xz | |
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.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: |