Browse Source

Merge branch 'fix'

* fix:
  fix various typos in documentation
maint
Junio C Hamano 19 years ago
parent
commit
935e714204
  1. 2
      Documentation/git-diff-tree.txt
  2. 4
      Documentation/git-update-index.txt
  3. 2
      revision.c

2
Documentation/git-diff-tree.txt

@ -92,7 +92,7 @@ separated with a single space are given. @@ -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

4
Documentation/git-update-index.txt

@ -10,8 +10,8 @@ SYNOPSIS @@ -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]

2
revision.c

@ -574,7 +574,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch @@ -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;

Loading…
Cancel
Save