diff options
| author | Finn Arne Gangstad <finnag@pvv.org> | 2007-12-18 20:50:28 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-19 16:58:42 -0800 |
| commit | 20b178de7b20a0ebf02b8da3b4791c06fc8e3a63 (patch) | |
| tree | 7d363898fe9d67392bc45bc8cf79bf54af057a46 /git-rebase--interactive.sh | |
| parent | 5909651ea2be69932d9b739b4441ca857ced7660 (diff) | |
| download | git-20b178de7b20a0ebf02b8da3b4791c06fc8e3a63.tar.gz git-20b178de7b20a0ebf02b8da3b4791c06fc8e3a63.tar.xz | |
Improved submodule merge support
When merging conflicting submodule changes from a supermodule, generate
a conflict message saying what went wrong. Also leave the tree in a state
where git status shows the conflict, and git submodule status gives the user
enough information to do the merge manally. Previously this would just fail.
Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions