From: "W. Trevor King" <wking@xxxxxxxxxx> If you try and update a submodule with a dirty working directory, you get an error message like: $ git submodule update error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting ... Mention this in the submodule notes. The previous phrase was short enough that I originally thought it might have been referring to the reflog note (obviously, uncommitted changes will not show up in the reflog either ;). Signed-off-by: W. Trevor King <wking@xxxxxxxxxx> --- Documentation/user-manual.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index cf09ddf..3381c22 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -3729,7 +3729,9 @@ module a NOTE: The changes are still visible in the submodule's reflog. -This is not the case if you did not commit your changes. +If you did not commit your submodule changes, the changes will *not* +be silently overwritten. Instead, you get the usual warning about not +being able switch from a dirty branch. [[low-level-operations]] Low-level Git operations -- 1.8.1.336.g94702dd -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html