From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (unknown [IPv6:2602:4b:a4d8:4b00:12bf:48ff:fe7c:5584]) by hurricane.the-brannons.com (Postfix) with ESMTPSA id 00DD877AA5 for ; Thu, 30 Jan 2014 08:13:57 -0800 (PST) From: Chris Brannon To: edbrowse-dev@lists.the-brannons.com References: <1391094843-5217-1-git-send-email-chris@the-brannons.com> <20140130155914.GC6131@toaster.adamthompson.me.uk> Date: Thu, 30 Jan 2014 08:13:34 -0800 In-Reply-To: <20140130155914.GC6131@toaster.adamthompson.me.uk> (Adam Thompson's message of "Thu, 30 Jan 2014 15:59:14 +0000") Message-ID: <87eh3pla6p.fsf@mushroom.PK5001Z> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Edbrowse-dev] [PATCH] Use the list class from the C++ STL, rather than C list macros. X-BeenThere: edbrowse-dev@lists.the-brannons.com X-Mailman-Version: 2.1.17 Precedence: list List-Id: Edbrowse Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2014 16:13:58 -0000 Adam Thompson writes: > Looks ok from an initial review, not built or tested though. Is this pushed? No, it isn't pushed. I wanted people to have a look before it is pushed. > Also, how do I tell my repo to track the master repo now rather than my fork? git remote set-url origin https://github.com/CMB/edbrowse.git git remote set-url origin 'git@github.com:CMB/edbrowse.git should do the trick. If the master branch in your local repo is out of sync with the one on CMB/edbrowse.git, you may also need to do something like: git branch -D master git branch master origin/master git checkout master But hopefully not. git can be daunting. I still find it so at times, even though I've been using it for about 6 years. -- Chris