From: Jens Lehmann Date: Thu, 9 Jan 2014 19:37:43 +0000 (-0800) Subject: Updated Submodule modes (org) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f77596c6edf7a3bbd2ad5146887761e1a07ac07a;p=git-submod-enhancements.wiki.git Updated Submodule modes (org) --- diff --git a/Submodule-modes.org b/Submodule-modes.org index bf31b00..230bfc8 100644 --- a/Submodule-modes.org +++ b/Submodule-modes.org @@ -1,2 +1,5 @@ +Depending on the [[Submodule use cases][Submodule use case]] a different mode of operation should be chosen for a submodule. This table describes different modes (/italics/ denote functionality that isn't implementeed in core git yet). + | Submodule mode | exact | branch | floating | -| Description | The SHA-1 recorded for the superproject is checked out as a detached HEAD | A local branch is used to integrate both local and upstream changes, still a SHA-1 is recorded to denote the exact submodule commit used | A local branch follows a remote branch, the SHA-1 only serves as an initial starting point and may be updated to record releases or other special occasions | \ No newline at end of file +| Description | The SHA-1 recorded for the superproject is checked out as a detached HEAD | A local branch is used to integrate both local and upstream changes, still a SHA-1 is recorded to denote the exact submodule commit used | A local branch follows a remote branch, the SHA-1 only serves as an initial starting point and may be updated to record releases or other special occasions, but doesn't have to | +| Configuration | | /???/ | =submodule..branch=: set to the upstream branch | \ No newline at end of file