Merge branch 'fix'

* fix:
fix various typos in documentation

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 2169169850da89283027778f47a40090bb6acfde..906830d4bf7b69e98fd1ef0d488976d29eae7749 100644 (file)
--- 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 4bdb2b0ffa63199a21c21a1a5c5e6703d0b33f02..23f2b6f1a5bd40f9e60efaf70b9c59e230979a15 100644 (file)
--- 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 ad78efda5183af3f7d98373f3f8c5d7723f46adf..c6e8702f380ccb9be914ae7608e9f6c3ec77d796 100644 (file)
--- 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;