rebase --merge question

2013-03-09 Thread Stijn Souffriau
isn't --merge the default behaviour. Thanks, Stijn -- Stijn Souffriau Embedded Software Developer - Mind Embedded Software Division ESSENSIUM nv Mind - Embedded Software Division Gaston Geenslaan 9 - B-3001 Leuven email : stijn.souffr...@essensium.com Web: www.essensium.com / www.mind.

dangling submodule references after rebase

2012-08-30 Thread Stijn Souffriau
Hi all, I am using a repository that has a sub module which is being committed to frequently by myself as well as others. Because of the heavy concurrent development I need to do a lot of rebasing. Since the sub module commit hashes referenced by the parent repository can become dangling as a

dangling submodule references after rebase

2012-08-29 Thread Stijn Souffriau
Hi all, I am using a repository that has a sub module which is being committed to frequently by myself as well as others. Because of the heavy concurrent development I need to do a lot of rebasing. Since the sub module commit hashes referenced by the parent repository can become dangling as a