diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-01-31 13:24:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-31 18:24:53 (GMT) |
| commit | 6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566 (patch) | |
| tree | 7e41d2a126b9090d7d3eaaa37c4dead8ce2a090a /Documentation/git-submodule.txt | |
| parent | b0883aa6c77111e88496bd0afe073caf68ab9f99 (diff) | |
| download | git-6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566.zip git-6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566.tar.gz git-6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566.tar.bz2 | |
Fix typos in technical documentation.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-submodule.txt')
| -rw-r--r-- | Documentation/git-submodule.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 63aa694..2502531 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -218,7 +218,7 @@ OPTIONS This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not - be detached. If a a merge failure prevents this process, you will have + be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit. |