summaryrefslogtreecommitdiff
path: root/Documentation/git-ls-files.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-24 10:58:57 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-24 10:58:57 -0800
commit77b3b7969d1a817e28639dc75305a9e301f0d4b4 (patch)
tree2380bdd4109ef47c82ecc27bf645f0ec47f233d6 /Documentation/git-ls-files.txt
parent7ecee3314fdafd8015fd14bfb76ae4b601acc25e (diff)
parent3588cf94812d47dd34b82039c7776f5225a947fb (diff)
downloadgit-77b3b7969d1a817e28639dc75305a9e301f0d4b4.tar.gz
Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast
* 'doc-style/for-next' of git://repo.or.cz/git/trast: Documentation: merge: use MERGE_HEAD to refer to the remote branch Documentation: simplify How Merge Works Documentation: merge: add a section about fast-forward Documentation: emphasize when git merge terminates early Documentation: merge: add an overview Documentation: merge: move merge strategy list to end Documentation: suggest `reset --merge` in How Merge Works section Documentation: merge: move configuration section to end Documentation: emphasise 'git shortlog' in its synopsis Documentation: show-files is now called git-ls-files Documentation: tiny git config manual tweaks Documentation: git gc packs refs by default now Conflicts: Documentation/config.txt
Diffstat (limited to 'Documentation/git-ls-files.txt')
-rw-r--r--Documentation/git-ls-files.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index af409bf3b2..3521637b58 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -141,7 +141,7 @@ OPTIONS
Output
------
-show files just outputs the filename unless '--stage' is specified in
+'git ls-files' just outputs the filenames unless '--stage' is specified in
which case it outputs:
[<tag> ]<mode> <object> <stage> <file>