Changes between Version 41 and Version 42 of StartModMaint
- Timestamp:
- Dec 22, 2013, 4:01:05 PM (9 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
StartModMaint
v41 v42 38 38 The {{{git submodule update}}} may switch submodules back to the detached state, depending on the working copy's exact situation. 39 39 40 The following table, based on actual tests run using git version 1.8.4.msysgit.0, shows the effect of {{{git submodule update}}} on a submodule:41 42 || ''' Branch''' || '''Contents''' || '''Super Origin''' || '''Changes''' ||40 The following table, based on actual tests run using git version 1.8.4.msysgit.0, shows the effects on a submodule of the above commands. 41 42 || '''Submodule Branch''' || '''Submodule Contents''' || '''Submodule relative to super-project''' || '''Effects''' || 43 43 || Detached || Unmodified || Up-to-date || None || 44 || Detached || Unmodified || Behind || Updated ||44 || Detached || Unmodified || Behind || Content updated || 45 45 || Detached || Uncommitted change || Up-to-date || 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 Unable to checkout (SHA...) in submodule path '...' || 46 46 || Detached || Uncommitted change || Behind || 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 Unable to checkout (SHA ...) in submodule path '...' || 47 47 || Detached || Committed change || Up-to-date || Detached || 48 || Detached || Committed change || Behind || Detached, updated ||48 || Detached || Committed change || Behind || Detached, content updated || 49 49 || {{{master}}} || Unmodified || Up-to-date || Detached || 50 || {{{master}}} || Unmodified || Behind || Updated (but '''not detached''') ||50 || {{{master}}} || Unmodified || Behind || Content updated (but '''not detached''') || 51 51 || {{{master}}} || Uncommitted change || Up-to-date || 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 Unable to checkout (SHA...) in submodule path '...' || 52 52 || {{{master}}} || Uncommitted change || Behind || 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 Unable to checkout (SHA...) in submodule path '...' || 53 53 || {{{master}}} || Committed change || Up-to-date || Detached || 54 || {{{master}}} || Committed change || Behind || Detached, updated ||54 || {{{master}}} || Committed change || Behind || Detached, content updated || 55 55 || {{{develop}}} || Unmodified || Up-to-date || Detached || 56 || {{{develop}}} || Unmodified || Behind || Detached, updated ||56 || {{{develop}}} || Unmodified || Behind || Detached, content updated || 57 57 || {{{develop}}} || Uncommitted change || Up-to-date || 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 Unable to checkout (SHA...) in submodule path '...' || 58 58 || {{{develop}}} || Uncommitted change || Behind || 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 Unable to checkout (SHA...) in submodule path '...' || 59 59 || {{{develop}}} || Committed change || Up-to-date || Detached || 60 || {{{develop}}} || Committed change || Behind || Detached, updated ||60 || {{{develop}}} || Committed change || Behind || Detached, content updated || 61 61 62 62 To get more information about submodules:
