summaryrefslogtreecommitdiffstats
path: root/gitcore-tutorial.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-01-13 16:47:56 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-01-13 16:47:56 +0000
commit6efe3023cc16b3c4ece5a9ea43114109002cbe86 (patch)
tree1b1ab82ea2d5cbb694658f7aec0bcbc0cae7bcc8 /gitcore-tutorial.txt
parent1c95827e7c795dfbae054c5d10c461d8768b0e8d (diff)
downloadgit-htmldocs-6efe3023cc16b3c4ece5a9ea43114109002cbe86.tar.gz
Autogenerated HTML docs for v1.6.1-98-g3ea95
Diffstat (limited to 'gitcore-tutorial.txt')
-rw-r--r--gitcore-tutorial.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt
index e4dd5518c..7ba5e589d 100644
--- a/gitcore-tutorial.txt
+++ b/gitcore-tutorial.txt
@@ -1243,10 +1243,10 @@ $ git ls-files --stage
------------
In our example of only two files, we did not have unchanged
-files so only 'example' resulted in collapsing, but in real-life
-large projects, only small number of files change in one commit,
-and this 'collapsing' tends to trivially merge most of the paths
-fairly quickly, leaving only a handful the real changes in non-zero
+files so only 'example' resulted in collapsing. But in real-life
+large projects, when only a small number of files change in one commit,
+this 'collapsing' tends to trivially merge most of the paths
+fairly quickly, leaving only a handful of real changes in non-zero
stages.
To look at only non-zero stages, use `\--unmerged` flag: