From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH 1/2] checkout --conflict=<style>: recreate merge in a non-default style
Date: Mon, 01 Sep 2008 09:52:37 +0200 [thread overview]
Message-ID: <48BB9F45.4070509@viscovery.net> (raw)
In-Reply-To: <7v4p501j2y.fsf@gitster.siamese.dyndns.org>
Junio C Hamano schrieb:
> +--conflict=<style>::
> + The same as --merge option above, but changes the way the
> + conflicting hunks are presented, overriding the
> + merge.conflictstyle configuration variable. Possible values are
> + "merge" (default) and "diff3" (in addition to what is shown by
> + "merge" style, shows the original contents).
> +
If --conflict is basically the same as --merge, couldn't we then pass
style argument to --merge or omit it to get the default style?
-- Hannes
next prev parent reply other threads:[~2008-09-01 7:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-01 6:22 [PATCH 1/2] checkout --conflict=<style>: recreate merge in a non-default style Junio C Hamano
2008-09-01 7:52 ` Johannes Sixt [this message]
2008-09-01 10:39 ` Junio C Hamano
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=48BB9F45.4070509@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=torvalds@linux-foundation.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).