On Tue, Jan 07, 2014 at 11:21:28AM -0800, Junio C Hamano wrote: > "W. Trevor King" <wk...@tremily.us> writes: > > On Tue, Jan 07, 2014 at 10:15:25AM -0800, Junio C Hamano wrote: > >> Having writing all the above and then looking at the patch again, it > >> is not immediately obvious to me where you use "rebase" when doing > >> the initial checkout, though. > > > > It's used to shift the local branch reference from from the > > (arbitrary) cloned remote branch tip to the explicit submodule $sha1. > > The objective is not what I was questioning. In the patch I see > > git checkout -f -q -B "$branch" "origin/$branch" > > used in the module_clone (which I think makes sense), and then > cmd_update uses "git reset --hard -q" to make sure that the working > tree matches the commit $sha1 obtained from the superproject's > gitlink (which may make $branch diverged from origin/$branch, but > still I think it makes sense). > > But there is no 'rebase' I can see in the codepath, which was what I > was puzzled about.
Ah, thanks. s/rebase/reset/ in the commit message ;). Cheers, Trevor -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
Description: OpenPGP digital signature