From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernt Hansen <bernt@norang.ca>
Subject: Re: Orgmode[PATCH 4/4] Add handling of blockquote and output formats
 that must be flowed.
Date: Thu, 29 Apr 2010 13:00:36 -0400
Message-ID: <87vdbaqjm3.fsf@gollum.intra.norang.ca>
References: <1272490799-22448-1-git-send-email-rpgoldman@sift.info>
	<1272490799-22448-2-git-send-email-rpgoldman@sift.info>
	<sdaasmweii.fsf@wjh.hardakers.net>
	<D04AFF42-625F-4AEC-A1BE-73EDEA5598A9@uva.nl>
	<4BD9A051.3000102@real-time.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O7X6c-00086T-5l
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:00:54 -0400
Received: from [140.186.70.92] (port=46549 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O7X6b-00086J-1I
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:00:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <bernt@norang.ca>) id 1O7X6Y-0000st-DN
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:00:52 -0400
Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:53838)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <bernt@norang.ca>) id 1O7X6Y-0000sg-8r
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 13:00:50 -0400
In-Reply-To: <4BD9A051.3000102@real-time.com> (Robert Goldman's message of
	"Thu\, 29 Apr 2010 10\:05\:53 -0500")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: rpgoldman@real-time.com
Cc: Carsten Dominik <dominik@uva.nl>, emacs-orgmode@gnu.org, "Robert P. Goldman" <rpgoldman@sift.info>

Robert Goldman <rpgoldman@real-time.com> 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.

HTH,
Bernt