diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-03 17:15:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-03 17:15:06 -0700 |
| commit | 935e714204fe167aa6172a733e7131ee5b4577f4 (patch) | |
| tree | a3c51209f5b19cbc24b2c358acb834dd423a05a0 /Documentation | |
| parent | 899707dac0c4a29b5b05a88a0017639508d48e7f (diff) | |
| parent | de5f2bf3612a43af074a98fd1fcdef6a403daf3f (diff) | |
| download | git-935e714204fe167aa6172a733e7131ee5b4577f4.tar.gz | |
Merge branch 'fix'
* fix:
fix various typos in documentation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 2169169850..906830d4bf 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 4bdb2b0ffa..23f2b6f1a5 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] |