From: Stephen Boyd <bebarino@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Stefan Monnier <monnier@iro.umontreal.ca>
Subject: Re: [PATCH 11/16] revert_or_cherry_pick(): get oneline_body from get_oneline()
Date: Wed, 17 Mar 2010 13:09:55 -0700 [thread overview]
Message-ID: <780e0a6b1003171309k75b33d3cpb4b1c6370d67942f@mail.gmail.com> (raw)
In-Reply-To: <20100317121546.GK25641@progeny.tock>
On Wed, Mar 17, 2010 at 5:15 AM, Jonathan Nieder <jrnieder@gmail.com> wrote:
>
> Maybe the next few patches should be squashed. They are separated one
> commit per idea, but they affect the same code.
>
Could all this code just use the custom format printing routines in
pretty.c? It might not be super efficient but at least it wouldn't
duplicate a bunch of code.
next prev parent reply other threads:[~2010-03-17 20:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-17 11:36 [PATCH v2 0/16] Add label for common ancestor to conflictstyle=diff3 Jonathan Nieder
2010-03-17 11:46 ` [PATCH 01/16] xdl_merge(): add optional ancestor label to diff3-style output Jonathan Nieder
2010-03-17 14:22 ` Bert Wesarg
2010-03-20 22:47 ` Jonathan Nieder
2010-03-17 11:53 ` [PATCH 02/16] xdl_merge(): move file1 and file2 labels to xmparam structure Jonathan Nieder
2010-03-17 11:57 ` [PATCH 03/16] merge-file --diff3: add a label for ancestor Jonathan Nieder
2010-03-17 12:03 ` [PATCH 04/16] ll_merge(): add ancestor label parameter for diff3-style output Jonathan Nieder
2010-03-17 12:04 ` [PATCH 05/16] checkout --conflict=diff3: add a label for ancestor Jonathan Nieder
2010-03-17 12:05 ` [PATCH 06/16] merge_file(): add comment explaining behavior wrt conflict style Jonathan Nieder
2010-03-17 12:08 ` [PATCH 07/16] merge_trees(): add ancestor label parameter for diff3-style output Jonathan Nieder
2010-03-17 12:09 ` [PATCH 08/16] tests: document format of conflicts from checkout -m Jonathan Nieder
2010-03-17 12:13 ` [PATCH 09/16] checkout -m --conflict=diff3: add a label for ancestor Jonathan Nieder
2010-03-17 12:13 ` [PATCH 10/16] tests: document cherry-pick behavior in face of conflicts Jonathan Nieder
2010-03-17 12:15 ` [PATCH 11/16] revert_or_cherry_pick(): get oneline_body from get_oneline() Jonathan Nieder
2010-03-17 20:09 ` Stephen Boyd [this message]
2010-03-18 3:16 ` Jonathan Nieder
2010-03-18 3:33 ` [PATCH 11,13,14 v2] revert: clarify label on conflict hunks Jonathan Nieder
2010-03-18 3:34 ` [PATCH 15/16 v2] cherry-pick, revert: add a label for ancestor Jonathan Nieder
2010-03-17 12:16 ` [PATCH 12/16] compat: add mempcpy() Jonathan Nieder
2010-03-17 12:17 ` [PATCH 13/16] revert: simplify get_oneline() using mempcpy Jonathan Nieder
2010-03-17 12:19 ` [PATCH 14/16] revert: clarify label on conflict hunks Jonathan Nieder
2010-03-17 12:23 ` [PATCH 15/16] cherry-pick: add a label for ancestor Jonathan Nieder
2010-03-17 12:26 ` [PATCH 16/16] merge-recursive: " Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=780e0a6b1003171309k75b33d3cpb4b1c6370d67942f@mail.gmail.com \
--to=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=monnier@iro.umontreal.ca \
/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.
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 NNTP newsgroup(s).