On Sat, Dec 28, 2013 at 5:17 PM, H. S. Teoh <[email protected]> wrote:
> On Fri, Dec 27, 2013 at 07:55:34PM -0800, Andrei Alexandrescu wrote: > > We've been using the remote name "upstream" instead of the default > > "origin", and that's quickly becoming lava (some people first clone > > our repos and then try to use update.sh etc leading to confusion). > > > > So we should just use "upstream" for the mothership and call it a > > day. Each of us has their own fork for which I don't know of a > > standardized name (I call mine "myfork"). > [...] > > I'm confused. I've had the tools repo forked and checked out, and I > haven't had a problem: > > $ git remote -v > origin [email protected]:quickfur/tools.git (fetch) > origin [email protected]:quickfur/tools.git (push) > upstream https://github.com/D-Programming-Language/tools.git(fetch) > upstream https://github.com/D-Programming-Language/tools.git (push) > $ > > So what exactly am I supposed to rename here? > > This is all correct, you should rename nothing, unless you want to. > > At least as far as github conventions go (I can't speak for git users in > general), your fork is usually tied to 'origin', and 'upstream' refers > to the where it forked from. Usually, you'd pull from 'upstream' (the > 'official' repo, to get the latest updates), and push to 'origin' (your > fork, e.g., when making pull requests, or just syncing your fork to the > latest official repo). > > Exactly.
_______________________________________________ dmd-internals mailing list [email protected] http://lists.puremagic.com/mailman/listinfo/dmd-internals
