--- /dev/null
+Return-Path: <dmitry.kurochkin@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 377D5429E2A\r
+ for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 10:10:22 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 8hAJA2-KpaNQ for <notmuch@notmuchmail.org>;\r
+ Wed, 15 Jun 2011 10:10:20 -0700 (PDT)\r
+Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com\r
+ [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id F06D9431FB6\r
+ for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 10:10:19 -0700 (PDT)\r
+Received: by fxm8 with SMTP id 8so608784fxm.26\r
+ for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 10:10:18 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+ h=domainkey-signature:from:to:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version:content-type;\r
+ bh=wV2CPMBAOsVKUpH3QEY3LuN3SY4FDA4/JEyrR1FlvuQ=;\r
+ b=NauY/i9aCUh5DNMF7/InjuFRcs06y2/633nBdu2K/6HxlHP4GUqRDV+PFI71RL10u6\r
+ cvNK5iVvmMDkW2Gay0KmkGyFbOasYryrLZiPO3VhLq1OaXgfD/RtzQOi00vYrSbG29dk\r
+ 8XEj9iB1uOWuocudbHuGF9OFHfqB2azhge92Q=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version:content-type;\r
+ b=OSnKQfMsIkkrU4Twm33R9oK54L6pLnKSZ4IbOS+35Qj59xdnADu5VipkvwDFqWtQqT\r
+ 5WUydiNGPyUbU3AMZJPNIdN7Hk5vAsycsrdMatoyzL0SyHyfXFb0pTIkv2eTeTxumels\r
+ EZwlOuBXxqLufONWwpGhc7eyphVO3MVzCAAXU=\r
+Received: by 10.223.24.134 with SMTP id v6mr860357fab.146.1308157818445;\r
+ Wed, 15 Jun 2011 10:10:18 -0700 (PDT)\r
+Received: from localhost ([91.144.186.21])\r
+ by mx.google.com with ESMTPS id o23sm341726faa.33.2011.06.15.10.10.16\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Wed, 15 Jun 2011 10:10:17 -0700 (PDT)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: Carl Worth <cworth@cworth.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/5] Fix hiding a message while some citations are shown\r
+ in notmuch-show view.\r
+In-Reply-To: <87fwnbf2rv.fsf@yoom.home.cworth.org>\r
+References: <1306361416-5019-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+ <1306361416-5019-4-git-send-email-dmitry.kurochkin@gmail.com>\r
+ <87oc2qa07g.fsf@yoom.home.cworth.org> <87k4depfyj.fsf@gmail.com>\r
+ <87lixu9z5b.fsf@yoom.home.cworth.org> <87hb8ipeb0.fsf@gmail.com>\r
+ <87ipsy9sue.fsf@yoom.home.cworth.org> <87d3j5pxk5.fsf@gmail.com>\r
+ <87k4ddcfnx.fsf@yoom.home.cworth.org> <877h9dp29t.fsf@gmail.com>\r
+ <87sjrbkx3j.fsf@yoom.home.cworth.org> <8739jbqiid.fsf@gmail.com>\r
+ <87fwnbf2rv.fsf@yoom.home.cworth.org>\r
+User-Agent: Notmuch/0.5-237-gf6d8cdb (http://notmuchmail.org) Emacs/23.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 15 Jun 2011 21:10:49 +0400\r
+Message-ID: <87sjrb10me.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 15 Jun 2011 17:10:22 -0000\r
+\r
+On Wed, 15 Jun 2011 10:00:36 -0700, Carl Worth <cworth@cworth.org> wrote:\r
+> On Wed, 15 Jun 2011 18:25:14 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote:\r
+> > I know you prefer tests to go before patches and I agree with that.\r
+> \r
+> Great!\r
+> \r
+> > But most of the time I do tests after coding.\r
+> \r
+> Yes, I do that order almost exclusively as well.\r
+> \r
+> > I do not know an easy way to reorder patches in git. (Also I do not\r
+> > know how to amend an old patch\r
+> \r
+> Fortunately, git has a great feature here for both use cases, (git\r
+> rebase -i). Here's the simple recipe:\r
+> \r
+> * Find a bug, fix a bug, commit\r
+> \r
+> * Write a test case, commit\r
+> \r
+> * Run the following command:\r
+> \r
+> git rebase -i origin/master\r
+> \r
+> At this point you'll be presented with an editor window giving one line\r
+> for each commit that you have made since origin/master. You can reorder\r
+> these lines however you'd like. When you save and exit the editor, the\r
+> commits will be applied in the order you saved.\r
+> \r
+> If there are any conflicts due to the re-ordering, then git rebase will\r
+> stop and tell you what to do, which will be:\r
+> \r
+> * Resolve the conflict\r
+> \r
+> * Run "git add" on the files you edited\r
+> \r
+> * Run "git rebase --continue"\r
+> \r
+> Also, back when editing the original list of commits, you can change the\r
+> word "apply" next to any particular commit to change what happens when\r
+> applying it. If you change that to "reword" you'll be given an editor\r
+> window to edit the commit message. If you use "edit" then you'll be\r
+> dropped to a shell where you can:\r
+> \r
+> * Edit the code\r
+> \r
+> * Test as necessary\r
+> \r
+> * Run "git commit --amend"\r
+> \r
+> * Run "git rebase --continue"\r
+> \r
+> I absolutely love "git rebase -i". It's one of my favorite\r
+> user-interface features in git.\r
+> \r
+\r
+Thanks for this. I did not know about interactive mode in rebase.\r
+\r
+This is some sort of replacement for darcs amend (which allows editing\r
+any patch, not just the last one).\r
+\r
+> > wish more darcs features in git.\r
+> \r
+> I don't know about "git rebase -i", but I think I heard that "git add\r
+> -i", (interactively add some portions of the dirty working tree to the\r
+> index to be committed). I think the menu-based interface of "git add -i"\r
+> is particularly clunky. But I love the trimmed-down interface of "git\r
+> add -p" which simply prompts one-patch-hunk-at-a-time for pieces to add\r
+> to the next commit. It even supports splitting a hunk, (or even manually\r
+> editing the patch to trim it down!). It's pretty slick stuff.\r
+> \r
+\r
+Yes, "add -i" is ugl... confusing, but "add -p" is very nice. A great\r
+feature of darcs picked up by git.\r
+\r
+> So there are some git tips that might be useful.\r
+> \r
+\r
+They will be useful indeed. Thanks!\r
+\r
+Regards,\r
+ Dmitry\r
+\r
+> > Thanks.\r
+> \r
+> You're quite welcome. Thanks for all the great work. Please keep it up!\r
+> \r
+> -Carl\r
+> \r
+> -- \r
+> carl.d.worth@intel.com\r
projects / notmuch-archives.git / commitdiff