# Automatic merge of local modifications in submodules?

1 messages from 2009-10-03 to 2009-10-03. Participants: Josef Wolf.
Thread: https://gitlist.dev/t/21120

## Josef Wolf, 2009-10-03 11:30

Subject: Automatic merge of local modifications in submodules?
Message-ID: <20091003113002.GA29831@raven.wolf.lan>
URL: https://gitlist.dev/e/20091003113002.GA29831%40raven.wolf.lan

```
Hello,

I am trying to explore gti's submodule functionality. Since I'm used to
svn:externals, I am missing the automatic merge of local modifications.
So I'd like to do something like:

  (cd submodule; git stash)
  git submodule update
  (cd submodule; git stash pop)

The problem with this command sequence is that it is not atomic. So if it
is automatically executed from a script (e.g cron or post-update-hook), it
will cause damage.

Any ideas how to properly auto-merge local modifications on submodule
update? git-submodule don't seem to have an option to do that.

```