author | Peter Hutterer <peter.hutterer@who-t.net> | |
Thu, 23 Apr 2009 23:06:38 +0000 (09:06 +1000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 24 Apr 2009 08:20:25 +0000 (01:20 -0700) | ||
commit | ca2cedba70e9356a1a20b0e39acd07ab92fee80e | |
tree | 4499831d6ce4549bf5cb25204c7b3f5813b52398 | tree | snapshot |
parent | ea0b767c1ea66f687e58a9fcff45a5a518e699c3 | commit | diff |
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>
'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>
Documentation/git-submodule.txt | diff | blob | history | |
Documentation/gitmodules.txt | diff | blob | history | |
git-submodule.sh | diff | blob | history | |
t/t7406-submodule-update.sh | [new file with mode: 0755] | blob |