summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-08 00:27:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-08 00:27:09 (GMT)
commitab1b3af7925682e0375667b892e2f7e985effba5 (patch)
tree3f2cdfe4fc3f15e385cf9ba00f06dc6bddf80943 /Documentation/git-read-tree.txt
parentfd4c6cc9d6f6a4a8bd9f4f2825675261f5d91c9c (diff)
parent99b41c84a53bf8bb09f06adeb0e3ded503afe706 (diff)
downloadgit-ab1b3af7925682e0375667b892e2f7e985effba5.zip
git-ab1b3af7925682e0375667b892e2f7e985effba5.tar.gz
git-ab1b3af7925682e0375667b892e2f7e985effba5.tar.bz2
Merge branch 'master' into next
* master: Documentation: git aliases git-cvsserver asciidoc formatting tweaks config.txt grammar, typo, and asciidoc fixes Documentation: git-ls-tree (typofix) Document git-ls-tree --fullname Document git aliases support make clean: remove dist-doc targets. Misc doc improvements Documentation: add missing docs make check-docs found. Some doc typo fixes Off-by-one error in get_path_prefix(), found by Valgrind gitk: Re-read the descendent/ancestor tag & head info on update
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 1c01d00..11bd9c0 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -266,7 +266,7 @@ file that does not match stage 2.
This is done to prevent you from losing your work-in-progress
changes, and mixing your random changes in an unrelated merge
commit. To illustrate, suppose you start from what has been
-commited last to your repository:
+committed last to your repository:
----------------
$ JC=`git-rev-parse --verify "HEAD^0"`