From: Philip Oakley Date: Sat, 02 Aug 2014 17:28:58 GMT Subject: Everday contents (was part of Re: What's cooking in git.git (Jul 2014, #04; Tue, 22)) Message-ID: <35435A61F3C04DC8924B2E2329F9461E@PhilipOakley> In-Reply-To: From: "Junio C Hamano" Sent: Friday, July 25, 2014 11:08 PM ... > > | Individual Developer (Participant)[[Individual Developer > (Participant)]] > | ------------------------------------------------------------------------ ... > | $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL > <5> Would I be right that "ALL" can simply be dropped as something from 'back then' (13 Dec 2005 v0.99.9-516-g44db136) that I'm ignorant of? ... > | <5> fetch from a specific branch from a specific repository and > merge. > | <6> revert the pull. > | <7> garbage collect leftover objects from reverted pull. > | <8> from time to time, obtain official tags from the `origin` > | and store them under `.git/refs/tags/`. > > This example works directly on 'master', which is not ideal. If I > were writing this today, I would have made it work on 'mine' branch, > produced a patch series out of that branch relative to @{u}, threw > in 'git send-email' invocation, and had "git pull" update the > pristine 'mater' branch after "git checkout master". Merging of > work by jgarzik (i.e. not your upstream) would also have gone to its > own branch, not to 'master'. > Slowly working through it ;-) Ta. Philip