From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Jan_B=F6cker?= Subject: Re: Re: [PATCH] added a new modeline face for tasks which have overrun their effort estimate Date: Wed, 20 Jan 2010 07:19:58 +0100 Message-ID: <4B56A08E.70703@jboecker.de> References: <4b56672b.0305560a.53c2.ffffcdc0@mx.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXTvi-0000VX-T1 for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:20:38 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXTve-0000UG-Jf for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:20:38 -0500 Received: from [199.232.76.173] (port=57182 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXTve-0000U8-E6 for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:20:34 -0500 Received: from mail7.worldserver.net ([217.13.200.27]:58796) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXTvd-0004i7-NU for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:20:34 -0500 In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Richard Riley Cc: emacs-orgmode@gnu.org On 20.01.2010 06:22, Richard Riley wrote: > > I believe I now have a repo set up that can be pulled from. Not sure if > its done the correct way since I didnt clone org-mode. Rather I pushed > my clone master and then the overrun branch. I *think* that should be > ok. > > Anyway, the URL is > > http://repo.or.cz/w/rgr-org-mode.git > > and the branch with patch is called "overrun". That is the URL to the web interface, which cannot be pulled from. The correct URL to clone/pull from is: git://repo.or.cz/rgr-org-mode.git > Sorry about the octopus > at the head of overrun - you will note that I didnt set my email > properly and all hell broke loose as I tried to reset the head and .... The cool thing about git is that it lets you fix this :) I see that you have committed the same patch three times with a different email address and/or commit message. What you want to do is to delete two of these commits. Enter git rebase --interactive, which allows you to rewrite history. Let's do this on a new branch, because rewriting history that others have already pulled can break things for them: $ git checkout overrun $ git checkout -b overrun-fixed We want to modify HEAD and the two commits before that: $ git rebase -i HEAD~2 You are now dropped into a text editor. Each line in the file you edit represents one commit. To drop a commit, simply delete the line (or comment it out). I assume that you want to keep commit 34b13cb... with the gmail address, so you would comment out the other two lines: # pick 09f2e0e added a new modeline face for tasks which have... pick 34b13cb added new face for task modeline clock for when... # pick da65d04 added a new modeline face for tasks which have... Then save the file and exit the editor. If everything succeeded, git rebase should say: Successfully rebased and updated refs/heads/overrun-fixed. Start gitk and take a look at your new, tidy overrun-fixed branch. If something goes wrong, you can abort the rebase with: $ git rebase --abort I cannot comment on the patch itself, as I am new to elisp myself and have never done anything with faces or mode-lines.