diff options
author | Junio C Hamano <junkio@cox.net> | 2007-05-26 18:53:22 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-26 18:53:22 -0700 |
commit | c56ed464b0ba275d9f2e3598c61b391e98fc217b (patch) | |
tree | f8d204103c41c8decf415c34a1b48b8c9bc9bd54 /Documentation/git-ls-files.txt | |
parent | fixes to output of git-verify-pack -v (diff) | |
parent | Merge branch 'maint-1.5.1' into maint (diff) | |
download | tgif-c56ed464b0ba275d9f2e3598c61b391e98fc217b.tar.xz |
Merge branch 'maint'
* maint:
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
Fix mishandling of $Id$ expanded in the repository copy in convert.c
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 076cebca17..43e0d2266c 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) |