From: Junio C Hamano <gitster@pobox.com>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] merge-file: add option to specify the marker size
Date: Sun, 28 Feb 2010 12:13:22 -0800 [thread overview]
Message-ID: <7viq9h3yql.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <972adf380be481b5e8d031481586e9c34da2cbb7.1267385538.git.bert.wesarg@googlemail.com> (Bert Wesarg's message of "Sun\, 28 Feb 2010 20\:56\:19 +0100")
Bert Wesarg <bert.wesarg@googlemail.com> writes:
> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>
> ---
>
> This can probably improved in a way, that the marker size will be taken
> from attributes. This could be done by an explicit --marker-size-by-path
> option or an option which names one of the three input files as a git
> path.
You don't want any option that is specifically about "marker size". An
option to specify the path to take attributes for would be the right way
to go. You might want to see "hash-object --path" for an inspiration.
next prev parent reply other threads:[~2010-02-28 20:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-28 19:56 [PATCH 1/3] merge-file: add option to specify the marker size Bert Wesarg
2010-02-28 19:56 ` [PATCH 2/3] make union merge an xdl merge favor Bert Wesarg
2010-02-28 20:15 ` Junio C Hamano
2010-03-01 6:57 ` Bert Wesarg
2010-03-01 9:01 ` Junio C Hamano
2010-03-01 10:55 ` Bert Wesarg
2010-03-01 17:28 ` Junio C Hamano
2010-02-28 19:56 ` [PATCH 3/3] refactor merge flags into xmparam_t Bert Wesarg
2010-02-28 20:13 ` Junio C Hamano [this message]
[not found] ` <36ca99e91002282315m6c3caf1el61755c0d96d21cf2@mail.gmail.com>
2010-03-01 9:18 ` [PATCH 1/3] merge-file: add option to specify the marker size Bert Wesarg
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=7viq9h3yql.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
/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).