Leila MuhtasibSigned-off-by: Leila Muhtasib <muhtasib@gmail.com> --- Documentation/diff-options.txt | 2 +- Documentation/git-submodule.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Show changes to 2 files +2 −2
Documentation/diff-options.txt, Documentation/git-submodule.txt
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 6cfedd8..cf4b216 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 9e488c0..fbbbcb2 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
-- 1.7.7.5 (Apple Git-26)
