diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-26 08:30:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-26 08:30:40 (GMT) |
| commit | d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a (patch) | |
| tree | 929a074f6c4001add762cdaefc11887a6a291966 /Documentation/git-ls-files.txt | |
| parent | c23290d528c208a25641f0fc278bac9bb9838265 (diff) | |
| parent | 20b3d206acbbb042c7ad5f42d36ff8d036a538c5 (diff) | |
| download | git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.zip git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.gz git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.bz2 | |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
More echo "$user_message" fixes.
Add tests for the last two fixes.
git-commit: use printf '%s\n' instead of echo on user-supplied strings
git-am: use printf instead of echo on user-supplied strings
Documentation: Add definition of "evil merge" to GIT Glossary
Replace the last 'dircache's by 'index'
Documentation: Clean up links in GIT Glossary
Diffstat (limited to 'Documentation/git-ls-files.txt')
| -rw-r--r-- | Documentation/git-ls-files.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 076cebc..43e0d22 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -124,7 +124,7 @@ which case it outputs: detailed information on unmerged paths. For an unmerged path, instead of recording a single mode/SHA1 pair, -the dircache records up to three such pairs; one from tree O in stage +the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see git-read-tree for more information on state) |