summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorLibravatar W. Trevor King <wking@tremily.us>2013-02-19 05:05:02 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-19 12:56:30 -0800
commit9148673377367db48183a33dcc53c828df397bfc (patch)
treedf7b54a57c26634110a76daa8cfe7ee0f3b5d918 /t/t7110-reset-merge.sh
parentuser-manual: Use request-pull to generate "please pull" text (diff)
downloadtgif-9148673377367db48183a33dcc53c828df397bfc.tar.xz
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>
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions