Changes between Version 42 and Version 43 of StartModMaint
- Timestamp:
- Dec 22, 2013, 4:11:30 PM (9 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
StartModMaint
v42 v43 40 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 41 42 || '''Submodule Branch''' || '''Submodule Contents''' || '''Submodule relative to super-project''' || '''Effects ''' ||42 || '''Submodule Branch''' || '''Submodule Contents''' || '''Submodule relative to super-project''' || '''Effects on Submodule''' || 43 43 || Detached || Unmodified || Up-to-date || None || 44 || Detached || Unmodified || Behind || Content updated||44 || Detached || Unmodified || Behind || {{{git pull}}} || 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 || Detached || Committed change || Up-to-date || Detached||48 || Detached || Committed change || Behind || Detached, content updated||49 || {{{master}}} || Unmodified || Up-to-date || Detached||50 || {{{master}}} || Unmodified || Behind || Content updated(but '''not detached''') ||47 || Detached || Committed change || Up-to-date || {{{git checkout --detach}}} || 48 || Detached || Committed change || Behind || {{{git checkout --detach; git pull}}} || 49 || {{{master}}} || Unmodified || Up-to-date || {{{git checkout --detach}}} || 50 || {{{master}}} || Unmodified || Behind || {{{git pull}}} (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 || {{{master}}} || Committed change || Up-to-date || Detached||54 || {{{master}}} || Committed change || Behind || Detached, content updated||55 || {{{develop}}} || Unmodified || Up-to-date || Detached||56 || {{{develop}}} || Unmodified || Behind || Detached, content updated||53 || {{{master}}} || Committed change || Up-to-date || {{{git checkout --detach}}} || 54 || {{{master}}} || Committed change || Behind || {{{git checkout --detach; git pull}}} || 55 || {{{develop}}} || Unmodified || Up-to-date || {{{git checkout --detach}}} || 56 || {{{develop}}} || Unmodified || Behind || {{{git checkout --detach; git pull}}} || 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 || {{{develop}}} || Committed change || Up-to-date || Detached||60 || {{{develop}}} || Committed change || Behind || Detached, content updated||59 || {{{develop}}} || Committed change || Up-to-date || {{{git checkout --detach}}} || 60 || {{{develop}}} || Committed change || Behind || {{{git checkout --detach; git pull}}} || 61 61 62 62 To get more information about submodules:
