From: Jens Lehmann Date: Thu, 9 Jan 2014 21:35:08 +0000 (-0800) Subject: Updated Submodule modes (org) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b0f8d78dd7c50f85fb226e1726abfd8ecd32b1b0;p=git-submod-enhancements.wiki.git Updated Submodule modes (org) --- diff --git a/Submodule-modes.org b/Submodule-modes.org index a47a34b..05d5c0d 100644 --- a/Submodule-modes.org +++ b/Submodule-modes.org @@ -3,4 +3,4 @@ Depending on the [[Submodule use cases][Submodule use case]] a different mode of | 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, but doesn't have to | | Typical use case | Content shared between different repos | Content shared between different repos | Content managed by somebody else | -| Configuration | None, the default of =submodule..update= is =checkout= which is the value for this mode | =submodule..update=: set to =merge= or =rebase= depending on the desired update method | =submodule..branch=: set to the upstream branch | \ No newline at end of file +| Configuration | =submodule..update=: =checkout=, which is the default | =submodule..update=: set to =merge= or =rebase= depending on the desired update method | =submodule..branch=: set to the upstream branch | \ No newline at end of file