From 6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 31 Jan 2010 14:24:39 +0100 Subject: Fix typos in technical documentation. Signed-off-by: Ralf Wildenhues Signed-off-by: Junio C Hamano --- Documentation/git-submodule.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-submodule.txt') diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 63aa694968..2502531a3d 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. -- cgit v1.3-5-g9baa