diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-24 09:06:38 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-24 01:20:25 -0700 |
| commit | ca2cedba70e9356a1a20b0e39acd07ab92fee80e (patch) | |
| tree | 4499831d6ce4549bf5cb25204c7b3f5813b52398 /Documentation/gitmodules.txt | |
| parent | ea0b767c1ea66f687e58a9fcff45a5a518e699c3 (diff) | |
| download | git-ca2cedba70e9356a1a20b0e39acd07ab92fee80e.tar.gz | |
git-submodule: add support for --rebase.
'git submodule update --rebase' rebases your local branch on top of what
would have been checked out to a detached HEAD otherwise.
In some cases, detaching the HEAD when updating a submodule complicates
the workflow to commit to this submodule (checkout master, rebase, then
commit). For submodules that require frequent updates but infrequent
(if any) commits, a rebase can be executed directly by the git-submodule
command, ensuring that the submodules stay on their respective branches.
git-config key: submodule.$name.rebase (bool)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitmodules.txt')
| -rw-r--r-- | Documentation/gitmodules.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index d1a17e2625..7c22c40949 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -30,6 +30,9 @@ submodule.<name>.path:: submodule.<name>.url:: Defines an url from where the submodule repository can be cloned. +submodule.<name>.rebase:: + Defines that the submodule should be rebased by default. + EXAMPLES -------- |