* Automatic merge of local modifications in submodules?
@ 2009-10-03 11:30 Josef Wolf
0 siblings, 0 replies; only message in thread
From: Josef Wolf @ 2009-10-03 11:30 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-10-03 11:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-03 11:30 Automatic merge of local modifications in submodules? Josef Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).