From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Goldman Subject: Re: Orgmode[PATCH 4/4] Add handling of blockquote and output formats that must be flowed. Date: Thu, 29 Apr 2010 12:25:30 -0500 Message-ID: <4BD9C10A.6040504@real-time.com> References: <1272490799-22448-1-git-send-email-rpgoldman@sift.info> <1272490799-22448-2-git-send-email-rpgoldman@sift.info> <4BD9A051.3000102@real-time.com> <87vdbaqjm3.fsf@gollum.intra.norang.ca> Reply-To: rpgoldman@real-time.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 1O7XUi-0002pL-J9 for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:25:48 -0400 Received: from [140.186.70.92] (port=55326 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7XUh-0002oj-5o for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:25:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7XUe-0004Q9-Nq for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:25:46 -0400 Received: from enchanter.real-time.com ([63.170.91.11]:2246) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7XUe-0004Pv-IW for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:25:44 -0400 In-Reply-To: <87vdbaqjm3.fsf@gollum.intra.norang.ca> 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: Bernt Hansen Cc: Carsten Dominik , emacs-orgmode@gnu.org, "Robert P. Goldman" On 4/29/10 Apr 29 -12:00 PM, Bernt Hansen wrote: > Robert Goldman writes: > >> On 4/29/10 Apr 29 -8:58 AM, Carsten Dominik wrote: >>> Applied, thanks. >>> >>> I had two email saying patch 4/4, I too one of them, what happened with >>> 1/4, 2/4, 3/4? >> >> What happened was that I am incompetent with git. Somehow git thinks >> that my copy is four patches away from origin/master. But, in fact, >> only the last patch (hence 4/4) is a bona fide diff from origin/master >> (your version). >> >> To use a cliche, I need to figure out how to convince git that I am now >> on the same page as the origin. I think this may have something to do >> with submitting patches by email instead of pushing them. I will try to >> figure this out before submitting my next patch. > > git format-patch -1 > > should give you a single patch with no numbers. You can specify how > many commits to include with -n (eg. git format-patch -3 ) and it > numbers the 3 patches appropriately. > > You can turn off the patch numbering if they are unrelated with > --no-numbered. > > If you are using git send-email it uses the same format-patch parameters > IIRC. > > I use git send-email --annotate > > which brings each patch into an edit buffer where I can add extra > (non-commit message) information before the diffstat. Thanks, Bernt. That's /very/ helpful. git send-email and format-patch have a pretty overwhelming set of options, and this will help me focus on the ones I should use. A quick follow-up --- I got into trouble by sending patches computed versus origin/master. It turns out that this is not what I (or anyone else, I would have thought) wants. What I want is to get patches relative to the merge commit that brings together my local commits and origin/master. Is there a common way to encourage git to do that? thanks, r