{"thread":{"id":"21120","subject":"Automatic merge of local modifications in submodules?","startedAt":"2009-10-03T11:30:02Z","lastAt":"2009-10-03T11:30:02Z","messageCount":1,"participants":["Josef Wolf"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"124172","messageId":"20091003113002.GA29831@raven.wolf.lan","threadId":"21120","inReplyTo":null,"subject":"Automatic merge of local modifications in submodules?","fromName":"Josef Wolf","fromEmail":"jw@raven.inka.de","sentAt":"2009-10-03T11:30:02Z","receivedAt":"2009-10-03T11:30:02Z","isPatch":false,"sender":{"key":"jw@raven.inka.de","avatar":null},"body":"Hello,\n\nI am trying to explore gti's submodule functionality. Since I'm used to\nsvn:externals, I am missing the automatic merge of local modifications.\nSo I'd like to do something like:\n\n  (cd submodule; git stash)\n  git submodule update\n  (cd submodule; git stash pop)\n\nThe problem with this command sequence is that it is not atomic. So if it\nis automatically executed from a script (e.g cron or post-update-hook), it\nwill cause damage.\n\nAny ideas how to properly auto-merge local modifications on submodule\nupdate? git-submodule don't seem to have an option to do that.\n"}]}