From: Joachim Schmitz Date: Tue, 11 Sep 2012 12:48:29 GMT Subject: RE: How to update a cloned git repository Message-ID: <007101cd901b$bea9d3d0$3bfd7b70$@schmitz-digital.de> In-Reply-To: > From: Matthieu Moy [mailto:Matthieu.Moy@grenoble-inp.fr] > Sent: Tuesday, September 11, 2012 2:41 PM > To: Joachim Schmitz > Cc: git > Subject: Re: How to update a cloned git repository > > [ Re-adding git@vger in Cc, I guess it was meant to be so ] Oops, yes it was meant to. > "Joachim Schmitz" writes: > > >> Then, work on the tip of the topic branch you depend on instead of pu. > >> These are more stable, as they will be rewritten only if this particular > >> topic branch changes. > > > > These are not available from git hub. Or are they? How? > > I think they exist in some of the repos junio pushes to, but I don't > remember how/which one. > > Anyway, you can easily get it from the commit that merges the branch > (it's the-merge-commit^1). > > >> > Like this? > >> > git pull --rebase HEAD~42 > >> > >> That would be "git fetch" and then "git rebase", as I don't think "git > >> pull --rebase" would allow you to specify the starting point for rebase. > > > > OK, I'll try that next time then. Like this? > > git fetch;git rebase HEAD~42 --onto origin/pu > > That should work, yes. > > In general, when you have a somehow complex workflow, I recommand > fetch+(merge|rebase) over pull. It gives you more flexibility, and the > opportunity to check what you fetched before starting the merge. OK, thanks. I'm sure I'll have more questions later though ;-)