Merge branch 'fix'

* fix:
  fix various typos in documentation
This commit is contained in:
Junio C Hamano 2006-05-03 17:15:06 -07:00
commit 935e714204
3 changed files with 4 additions and 4 deletions

View File

@ -92,7 +92,7 @@ separated with a single space are given.
Furthermore, it lists only files which were modified Furthermore, it lists only files which were modified
from all parents. from all parents.
-cc:: --cc::
This flag changes the way a merge commit patch is displayed, This flag changes the way a merge commit patch is displayed,
in a similar way to the '-c' option. It implies the '-c' in a similar way to the '-c' option. It implies the '-c'
and '-p' options and further compresses the patch output and '-p' options and further compresses the patch output

View File

@ -10,8 +10,8 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git-update-index' 'git-update-index'
[--add] [--remove | --force-remove] [--replace] [--add] [--remove | --force-remove] [--replace]
[--refresh [-q] [--unmerged] [--ignore-missing]] [--refresh] [-q] [--unmerged] [--ignore-missing]
[--cacheinfo <mode> <object> <file>]\* [--cacheinfo <mode> <object> <file>]\*
[--chmod=(+|-)x] [--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged] [--assume-unchanged | --no-assume-unchanged]

View File

@ -574,7 +574,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->max_count = atoi(arg + 12); revs->max_count = atoi(arg + 12);
continue; continue;
} }
/* accept -<digit>, like traditilnal "head" */ /* accept -<digit>, like traditional "head" */
if ((*arg == '-') && isdigit(arg[1])) { if ((*arg == '-') && isdigit(arg[1])) {
revs->max_count = atoi(arg + 1); revs->max_count = atoi(arg + 1);
continue; continue;