From 53e0a76e9a60ff679aceefcf7505e23b2a7cf8d6 Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Thu, 9 Jan 2014 12:22:34 -0800 Subject: [PATCH] Updated Submodule modes (org) --- Submodule-modes.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodule-modes.org b/Submodule-modes.org index f616a2a..a47a34b 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 | | =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 | 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 -- 2.26.2