<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Apr 14, 2015 at 8:51 AM, <span dir="ltr"><<a href="mailto:aaron@aaronboman.com" target="_blank">aaron@aaronboman.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><span class="">> ===<br> > git pull<br> > git submodule init<br> > git submodule foreach git pull<br> > ===<br> ><br> > Which I need so that the many submodules don't stray from the<br> > branch they are on and become detached. And BB is just another<br> > submodule. So it would be a PITA to do something special for<br> > BB. Gods why is git so horrible at this :-\ More than two<br> > years of being forced to use git and the cons are a magnitude<br> > larger than the pros.<br> <br> </span>Along with setting pull.rebase to true,</blockquote><div><br></div><div>OK, setting the rebase config worked. Too bad it gives this on update:</div><div><br></div><div>==</div><div>Entering 'tools/build'</div><div>Cannot pull with rebase: You have unstaged changes.</div><div>Please commit or stash them.</div><div>==</div><div><br></div><div>But seems to work nicely after I commit my local changes (so far). Thanks Volodya :-)</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"> you can also create an alias in<br> your global ~/.gitconfig file:<br> <br> [alias]<br> update = !git pull && git submodule update --init --recursive<br> <br> Then use it on the command line like so:<br> <br> ~/project/ $ git update<br></blockquote><div><br></div><div>Nice to know.. But doesn't immediately help as I need to share the script with other developers on my team so that we all update the same way. Is there a way to have that be a repo level option?</div></div><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">-- Rene Rivera<br>-- Grafik - Don't Assume Anything<br>-- Robot Dreams - <a href="http://robot-dreams.net/" target="_blank">http://robot-dreams.net</a><br>-- rrivera/<a href="http://acm.org/" target="_blank">acm.org</a> (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail</div></div> </div></div>