| commit | 9148673377367db48183a33dcc53c828df397bfc | |
| author | W. Trevor King <wking@tremily.us> | |
| Tue, 19 Feb 2013 10:05:02 +0000 (19 05:05 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Feb 2013 20:56:30 +0000 (19 12:56 -0800) | ||
| tree | df7b54a57c26634110a76daa8cfe7ee0f3b5d918 | treesnapshot (tar.gz zip) |
| parent | ae6ef554c8c785f96fce482e33cc78080aafc43f | commitdiff |
user-manual: Flesh out uncommitted changes and submodule updates
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@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/user-manual.txt | diffblobblamehistory |