--- /dev/null
+Return-Path: <cworth@cworth.org>\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 14D32429E26\r
+ for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 10:00:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.01\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.01 tagged_above=-999 required=5\r
+ tests=[T_MIME_NO_TEXT=0.01] 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 744yHln+YDcH for <notmuch@notmuchmail.org>;\r
+ Wed, 15 Jun 2011 10:00:43 -0700 (PDT)\r
+Received: from arlo.cworth.org (arlo.cworth.org [50.43.72.2])\r
+ by olra.theworths.org (Postfix) with ESMTP id 7A208431FB6\r
+ for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 10:00:43 -0700 (PDT)\r
+Received: from yoom.home.cworth.org (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 3DF7F29A4E5;\r
+ Wed, 15 Jun 2011 10:00:42 -0700 (PDT)\r
+Received: by yoom.home.cworth.org (Postfix, from userid 1000)\r
+ id 2C44C254154; Wed, 15 Jun 2011 10:00:42 -0700 (PDT)\r
+From: Carl Worth <cworth@cworth.org>\r
+To: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>, 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: <8739jbqiid.fsf@gmail.com>\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
+User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1\r
+ (i486-pc-linux-gnu)\r
+Date: Wed, 15 Jun 2011 10:00:36 -0700\r
+Message-ID: <87fwnbf2rv.fsf@yoom.home.cworth.org>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+ micalg=pgp-sha1; protocol="application/pgp-signature"\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:00:44 -0000\r
+\r
+--=-=-=\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Wed, 15 Jun 2011 18:25:14 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmai=\r
+l.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
+> 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
+=2Di", (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
+So there are some git tips that might be useful.\r
+\r
+> Thanks.\r
+\r
+You're quite welcome. Thanks for all the great work. Please keep it up!\r
+\r
+=2DCarl\r
+\r
+=2D-=20\r
+carl.d.worth@intel.com\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iEYEARECAAYFAk345TQACgkQ6JDdNq8qSWhO7QCgnJVRdO2iv7nZMLfnmR27Dz46\r
+kuIAoIjCapdf9E9P1fpNmCDqWCtx3MIv\r
+=CDbc\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r
projects / notmuch-archives.git / commitdiff