git-read-tree.txt: language and typography fixes
Fix a few missing articles and such, and mark-up 'commands' and `files` appropriately. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Sep 21, 2011 at 09:48 UTC
cc1a2b66e9c28ab77ceb122e21222d9c08228259
1 file changed
+20
-20
Documentation/git-read-tree.txt
+20
-20
@@ -46,7 +46,7 @@ OPTIONS
46
47
-i::
48
Usually a merge requires the index file as well as the
49
- files in the working tree are up to date with the
49
+ files in the working tree to be up to date with the
50
current head commit, in order not to lose local
51
changes. This flag disables the check with the working
52
tree and is meant to be used when creating a merge of
@@ -70,21 +70,21 @@ OPTIONS
70
--aggressive::
71
Usually a three-way merge by 'git read-tree' resolves
72
the merge for really trivial cases and leaves other
73
- cases unresolved in the index, so that Porcelains can
73
+ cases unresolved in the index, so that porcelains can
74
implement different merge policies. This flag makes the
75
- command to resolve a few more cases internally:
75
+ command resolve a few more cases internally:
76
+
77
* when one side removes a path and the other side leaves the path
78
unmodified. The resolution is to remove that path.
79
* when both sides remove a path. The resolution is to remove that path.
80
-* when both sides adds a path identically. The resolution
80
+* when both sides add a path identically. The resolution
81
is to add that path.
82
83
--prefix=<prefix>/::
84
Keep the current index contents, and read the contents
85
- of named tree-ish under directory at `<prefix>`. The
85
+ of the named tree-ish under the directory at `<prefix>`. The
86
original index file cannot have anything at the path
87
- `<prefix>` itself, and have nothing in `<prefix>/`
87
+ `<prefix>` itself, nor anything in the `<prefix>/`
88
directory. Note that the `<prefix>/` value must end
89
with a slash.
90
@@ -378,15 +378,15 @@ have finished your work-in-progress), attempt the merge again.
378
Sparse checkout
379
---------------
380
381
-"Sparse checkout" allows to sparsely populate working directory.
382
-It uses skip-worktree bit (see linkgit:git-update-index[1]) to tell
383
-Git whether a file on working directory is worth looking at.
381
+"Sparse checkout" allows populating the working directory sparsely.
382
+It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
383
+Git whether a file in the working directory is worth looking at.
384
385
-"git read-tree" and other merge-based commands ("git merge", "git
386
-checkout"...) can help maintaining skip-worktree bitmap and working
385
+'git read-tree' and other merge-based commands ('git merge', 'git
386
+checkout'...) can help maintaining the skip-worktree bitmap and working
387
directory update. `$GIT_DIR/info/sparse-checkout` is used to
388
-define the skip-worktree reference bitmap. When "git read-tree" needs
389
-to update working directory, it will reset skip-worktree bit in index
388
+define the skip-worktree reference bitmap. When 'git read-tree' needs
389
+to update the working directory, it resets the skip-worktree bit in the index
390
based on this file, which uses the same syntax as .gitignore files.
391
If an entry matches a pattern in this file, skip-worktree will be
392
set on that entry. Otherwise, skip-worktree will be unset.
@@ -396,18 +396,18 @@ skip-worktree turns from unset to set, it will add the corresponding
396
file back. If it turns from set to unset, that file will be removed.
397
398
While `$GIT_DIR/info/sparse-checkout` is usually used to specify what
399
-files are in. You can also specify what files are _not_ in, using
400
-negate patterns. For example, to remove file "unwanted":
399
+files are in, you can also specify what files are _not_ in, using
400
+negate patterns. For example, to remove the file `unwanted`:
401
402
----------------
403
*
404
!unwanted
405
----------------
406
407
-Another tricky thing is fully repopulating working directory when you
407
+Another tricky thing is fully repopulating the working directory when you
408
no longer want sparse checkout. You cannot just disable "sparse
409
-checkout" because skip-worktree are still in the index and you working
410
-directory is still sparsely populated. You should re-populate working
409
+checkout" because skip-worktree bits are still in the index and your working
410
+directory is still sparsely populated. You should re-populate the working
411
directory with the `$GIT_DIR/info/sparse-checkout` file content as
412
follows:
413
@@ -415,8 +415,8 @@ follows:
415
*
416
----------------
417
418
-Then you can disable sparse checkout. Sparse checkout support in "git
419
-read-tree" and similar commands is disabled by default. You need to
418
+Then you can disable sparse checkout. Sparse checkout support in 'git
419
+read-tree' and similar commands is disabled by default. You need to
420
turn `core.sparseCheckout` on in order to have sparse checkout
421
support.
422