summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d66ee04)
raw | patch | inline | side by side (parent: d66ee04)
author | Heiko Voigt <hvoigt@hvoigt.net> | |
Tue, 6 Jul 2010 19:34:31 +0000 (21:34 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 7 Jul 2010 04:28:55 +0000 (21:28 -0700) |
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7405-submodule-merge.sh | patch | blob | history |
index 9a21f783d3a5fedaa56df26919ab8e0456872e90..4a7b8933f4bf1036ba1e044d6e2dc54d72084039 100755 (executable)
git commit -m sub-b) &&
git add sub &&
test_tick &&
- git commit -m b
+ git commit -m b &&
git checkout -b c a &&
git merge -s ours b &&