From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:09:04 +0000 (-0700)
Subject: Merge branch 'nd/sparse-doc' into maint-1.7.6
X-Git-Tag: v1.7.8-rc0~7^2~5^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=139088b78b2b501d77a48d1d00b3b53ca16821e0;p=git.git

Merge branch 'nd/sparse-doc' into maint-1.7.6

* nd/sparse-doc:
  git-read-tree.txt: update sparse checkout examples
---

139088b78b2b501d77a48d1d00b3b53ca16821e0
diff --cc Documentation/git-read-tree.txt
index 1bd0317a4,e9f4355d7..537554982
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@@ -379,29 -378,29 +379,29 @@@ have finished your work-in-progress), a
  Sparse checkout
  ---------------
  
 -"Sparse checkout" allows to sparsely populate working directory.
 -It uses skip-worktree bit (see linkgit:git-update-index[1]) to tell
 -Git whether a file on working directory is worth looking at.
 +"Sparse checkout" allows populating the working directory sparsely.
 +It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
 +Git whether a file in the working directory is worth looking at.
  
 -"git read-tree" and other merge-based commands ("git merge", "git
 -checkout"...) can help maintaining skip-worktree bitmap and working
 +'git read-tree' and other merge-based commands ('git merge', 'git
 +checkout'...) can help maintaining the skip-worktree bitmap and working
  directory update. `$GIT_DIR/info/sparse-checkout` is used to
 -define the skip-worktree reference bitmap. When "git read-tree" needs
 -to update working directory, it will reset skip-worktree bit in index
 +define the skip-worktree reference bitmap. When 'git read-tree' needs
 +to update the working directory, it resets the skip-worktree bit in the index
  based on this file, which uses the same syntax as .gitignore files.
 -If an entry matches a pattern in this file, skip-worktree will be
 -set on that entry. Otherwise, skip-worktree will be unset.
 +If an entry matches a pattern in this file, skip-worktree will not be
 +set on that entry. Otherwise, skip-worktree will be set.
  
  Then it compares the new skip-worktree value with the previous one. If
 -skip-worktree turns from unset to set, it will add the corresponding
 -file back. If it turns from set to unset, that file will be removed.
 +skip-worktree turns from set to unset, it will add the corresponding
 +file back. If it turns from unset to set, that file will be removed.
  
  While `$GIT_DIR/info/sparse-checkout` is usually used to specify what
 -files are in. You can also specify what files are _not_ in, using
 -negate patterns. For example, to remove file "unwanted":
 +files are in, you can also specify what files are _not_ in, using
 +negate patterns. For example, to remove the file `unwanted`:
  
  ----------------
- *
+ /*
  !unwanted
  ----------------
  
@@@ -413,11 -412,11 +413,11 @@@ directory with the `$GIT_DIR/info/spars
  follows:
  
  ----------------
- *
+ /*
  ----------------
  
 -Then you can disable sparse checkout. Sparse checkout support in "git
 -read-tree" and similar commands is disabled by default. You need to
 +Then you can disable sparse checkout. Sparse checkout support in 'git
 +read-tree' and similar commands is disabled by default. You need to
  turn `core.sparseCheckout` on in order to have sparse checkout
  support.