aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kestenholz <matthias@spinlock.ch>2006-05-03 12:51:40 +0200
committerJunio C Hamano <junkio@cox.net>2006-05-03 14:08:41 -0700
commitde5f2bf3612a43af074a98fd1fcdef6a403daf3f (patch)
tree2560ea707a4e85cd140088a97721ba08178141d1
parente923effb43fa952f9cb72ffe4c3625fce7655bff (diff)
downloadgit-de5f2bf3612a43af074a98fd1fcdef6a403daf3f.tar.gz
git-de5f2bf3612a43af074a98fd1fcdef6a403daf3f.tar.xz
fix various typos in documentation
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
-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 216916985..906830d4b 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 d4137fc87..e01b42f44 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 03dd23893..5f2f0be38 100644
--- a/revision.c
+++ b/revision.c
@@ -537,7 +537,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;