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 14:08:46 -0400
Message-ID: <87r5lyqggh.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>
	<87vdbaqjm3.fsf@gollum.intra.norang.ca>
	<4BD9C10A.6040504@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 1O7YAR-0007fx-Ti
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 14:08:56 -0400
Received: from [140.186.70.92] (port=42803 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O7YAP-0007fK-Ns
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 14:08:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <bernt@norang.ca>) id 1O7YAO-00023J-4Y
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 14:08:53 -0400
Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:64433)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <bernt@norang.ca>) id 1O7YAO-00023F-2a
	for emacs-orgmode@gnu.org; Thu, 29 Apr 2010 14:08:52 -0400
In-Reply-To: <4BD9C10A.6040504@real-time.com> (Robert Goldman's message of
	"Thu\, 29 Apr 2010 12\:25\:30 -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:

> 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?

Hi Robert.

Just as a quick test I branched 10 commits back in origin/master
with

git checkout -b foo origin/master~10

and then created a couple of throw-away commits for format-patch to play
with (by editing and committing lisp/ChangeLog)

My history now looks something like this:


 o -- o -- B -- o -- o -- o -- ... -- o -- o -- A origin/master
            \
             X -- Y  foo

>From anywhere in the history I can do

git format-patch origin/master..foo

and I get only the X and Y commits created as patches.  You can
experiment with the git log command instead of format-patch to show the
commits you get.  Basically it lists the commits not in origin/master on
the foo branch.

If you happen to be at foo (commit Y) you can omit the second branch
name since HEAD is assumed so origin/master..foo is the same as
origin/master..

HTH,

Bernt