From: Robert Goldman <rpgoldman@real-time.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Carsten Dominik <dominik@uva.nl>,
emacs-orgmode@gnu.org, "Robert P. Goldman" <rpgoldman@sift.info>
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 [thread overview]
Message-ID: <4BD9C10A.6040504@real-time.com> (raw)
In-Reply-To: <87vdbaqjm3.fsf@gollum.intra.norang.ca>
On 4/29/10 Apr 29 -12:00 PM, Bernt Hansen wrote:
> 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.
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
next prev parent reply other threads:[~2010-04-29 17:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 21:39 org-export-generic patch Robert P. Goldman
2010-04-28 21:39 ` [PATCH 4/4] Add handling of blockquote and output formats that must be flowed Robert P. Goldman
2010-04-29 13:54 ` Orgmode[PATCH " Wes Hardaker
2010-04-29 13:58 ` Carsten Dominik
2010-04-29 15:05 ` Robert Goldman
2010-04-29 17:00 ` Bernt Hansen
2010-04-29 17:25 ` Robert Goldman [this message]
2010-04-29 18:08 ` Bernt Hansen
2010-04-29 15:00 ` Robert Goldman
2010-04-30 14:51 ` Wes Hardaker
2010-04-30 15:15 ` Robert Goldman
2010-04-30 15:28 ` Carsten Dominik
2010-04-30 15:45 ` Robert Goldman
2010-04-29 10:44 ` org-export-generic patch Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BD9C10A.6040504@real-time.com \
--to=rpgoldman@real-time.com \
--cc=bernt@norang.ca \
--cc=dominik@uva.nl \
--cc=emacs-orgmode@gnu.org \
--cc=rpgoldman@sift.info \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).