summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-04 00:15:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-04 00:15:06 (GMT)
commit935e714204fe167aa6172a733e7131ee5b4577f4 (patch)
treea3c51209f5b19cbc24b2c358acb834dd423a05a0
parent899707dac0c4a29b5b05a88a0017639508d48e7f (diff)
parentde5f2bf3612a43af074a98fd1fcdef6a403daf3f (diff)
downloadgit-935e714204fe167aa6172a733e7131ee5b4577f4.zip
git-935e714204fe167aa6172a733e7131ee5b4577f4.tar.gz
git-935e714204fe167aa6172a733e7131ee5b4577f4.tar.bz2
Merge branch 'fix'
* fix: fix various typos in documentation
-rw-r--r--Documentation/git-diff-tree.txt2
-rw-r--r--Documentation/git-update-index.txt4
-rw-r--r--revision.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 2169169..906830d 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -92,7 +92,7 @@ separated with a single space are given.
Furthermore, it lists only files which were modified
from all parents.
--cc::
+--cc::
This flag changes the way a merge commit patch is displayed,
in a similar way to the '-c' option. It implies the '-c'
and '-p' options and further compresses the patch output
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 4bdb2b0..23f2b6f 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -10,8 +10,8 @@ SYNOPSIS
--------
[verse]
'git-update-index'
- [--add] [--remove | --force-remove] [--replace]
- [--refresh [-q] [--unmerged] [--ignore-missing]]
+ [--add] [--remove | --force-remove] [--replace]
+ [--refresh] [-q] [--unmerged] [--ignore-missing]
[--cacheinfo <mode> <object> <file>]\*
[--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged]
diff --git a/revision.c b/revision.c
index ad78efd..c6e8702 100644
--- a/revision.c
+++ b/revision.c
@@ -574,7 +574,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->max_count = atoi(arg + 12);
continue;
}
- /* accept -<digit>, like traditilnal "head" */
+ /* accept -<digit>, like traditional "head" */
if ((*arg == '-') && isdigit(arg[1])) {
revs->max_count = atoi(arg + 1);
continue;