diff options
author | Spencer E. Olson <olsonse@umich.edu> | 2011-02-17 09:18:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-17 12:19:18 -0800 |
commit | 1b4735d9f3e0b7ea62c7c22f0afcb45e10c46c7e (patch) | |
tree | 587a7bdac48b280635eb73300dc4ddc129102d1b /git-gui/po | |
parent | Git 1.7.4 (diff) | |
download | tgif-1b4735d9f3e0b7ea62c7c22f0afcb45e10c46c7e.tar.xz |
submodule: no [--merge|--rebase] when newly cloned
"git submodule update" can be run with either the "--merge" or "--rebase"
option, or submodule.<name>.update configuration variable can be set to
"merge" or "rebase, to cause local work to get integrated when updating
the submodule.
When a submodule is newly cloned, however, it does not have a check out
when a rebase or merge is attempted, leading to a failure. For newly
cloned submodules, simply check out the appropriate revision. There is no
local work to integrate with for them.
Signed-off-by: Spencer E. Olson <olsonse@umich.edu>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/po')
0 files changed, 0 insertions, 0 deletions