From: Jens Lehmann Date: Thu, 9 Jan 2014 19:44:22 +0000 (-0800) Subject: Updated Submodule modes (org) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=709c1edc7bc3e152accb14fc0f138c30f9f711d1;p=git-submod-enhancements.wiki.git Updated Submodule modes (org) --- diff --git a/Submodule-modes.org b/Submodule-modes.org index 230bfc8..5d480ce 100644 --- a/Submodule-modes.org +++ b/Submodule-modes.org @@ -2,4 +2,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 | -| Configuration | | /???/ | =submodule..branch=: set to the upstream branch | \ No newline at end of file +| Configuration | | =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