From 329484256e0fe42676e93669122e7a5a007ef4ed Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Wed, 3 Jun 2009 08:27:06 +0200 Subject: Rename submodule..rebase to submodule..update The addition of "submodule..rebase" demonstrates the usefulness of alternatives to the default behaviour of "git submodule update". However, by naming the config variable "submodule..rebase", and making it a boolean choice, we are artificially constraining future git versions that may want to add _more_ alternatives than just "rebase". Therefore, while "submodule..rebase" is not yet in a stable git release, future-proof it, by changing it from submodule..rebase = true/false to submodule..update = rebase/checkout where "checkout" specifies the default behaviour of "git submodule update" (checking out the new commit to a detached HEAD), and "rebase" specifies the --rebase behaviour (where the current local branch in the submodule is rebase onto the new commit). Thus .update == checkout is equivalent to .rebase == false, and .update == rebase is equivalent to .rebase == true. Finally, leaving .update unset is equivalent to leaving .rebase unset. In future git versions, other alternatives to "git submodule update" behaviour can be included by adding them to the list of allowable values for the submodule..update variable. Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- Documentation/gitmodules.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Documentation/gitmodules.txt') diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 7c22c40949..1b67f0a9f1 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -30,8 +30,14 @@ submodule..path:: submodule..url:: Defines an url from where the submodule repository can be cloned. -submodule..rebase:: - Defines that the submodule should be rebased by default. +submodule..update:: + Defines what to do when the submodule is updated by the superproject. + If 'checkout' (the default), the new commit specified in the + superproject will be checked out in the submodule on a detached HEAD. + If 'rebase', the current branch of the submodule will be rebased onto + the commit specified in the superproject. + This config option is overridden if 'git submodule update' is given + the '--rebase' option. EXAMPLES -- cgit v1.2.1