diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-22 14:35:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-22 14:35:57 -0700 |
| commit | f71be5cc062e23c481944ba3f7e6d25fdcf58f28 (patch) | |
| tree | 50a72ab2c11c9fe476f9c4de79d4c782714d21a4 /Documentation | |
| parent | fd378070c8171ba33a9b1aeca37085e6dfbff35b (diff) | |
| parent | 8d8136c37a98bfb545f46990e3854df3414c3528 (diff) | |
| download | git-f71be5cc062e23c481944ba3f7e6d25fdcf58f28.tar.gz | |
Merge branch 'maint'
* maint:
Documentation: Fix misspellings
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-submodule.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 6cfedd85dc..cf4b216598 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -59,7 +59,7 @@ endif::git-format-patch[] Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns - if not connected to a terminal, and can be overriden by + if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 9e488c0aad..fbbbcb282c 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -140,7 +140,7 @@ update:: checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached unless `--rebase` or `--merge` is specified or the key `submodule.$name.update` is set to - `rebase`, `merge` or `none`. `none` can be overriden by specifying + `rebase`, `merge` or `none`. `none` can be overridden by specifying `--checkout`. + If the submodule is not yet initialized, and you just want to use the |