From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
geoffrey.russell@gmail.com, sverre@rabbelier.nl,
Johannes Sixt <j.sixt@viscovery.net>,
Miklos Vajna <vmiklos@frugalware.org>,
git@vger.kernel.org
Subject: Re: [PATCH 2/2] git-merge-recursive-{ours,theirs}
Date: Sat, 21 Jun 2008 09:56:45 -0700 (PDT) [thread overview]
Message-ID: <m3zlpeloah.fsf@localhost.localdomain> (raw)
In-Reply-To: <7vy74z9l3l.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Actually, I think "git-merge-recursive-theirs" is a mistake. We should
> bite the bullet and give "git-merge" an ability to pass backend specific
> parameters to "git-merge-recursive". The new convention could be that
> anything that begins with -X is passed to the backend.
>
> E.g.
>
> git merge -Xfavor=theirs foo
> git merge -Xsubtree=/=gitk-git paulus
Gaaah... only after reading it for third time I see that it isn't
some funky "=/=" symbol, but subtree with grafing '/' in one side
to 'gitk-git' subdirectory in other side.
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2008-06-21 16:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-16 4:16 Guided merge with override Geoff Russell
2008-06-16 9:25 ` Miklos Vajna
2008-06-16 10:16 ` Johannes Sixt
2008-06-16 21:16 ` Miklos Vajna
2008-06-16 22:21 ` Sverre Rabbelier
2008-06-16 22:45 ` Geoff Russell
2008-06-17 20:04 ` Junio C Hamano
2008-06-18 15:19 ` Johannes Schindelin
2008-06-18 15:28 ` Johannes Schindelin
2008-06-18 16:31 ` Junio C Hamano
2008-06-18 19:29 ` Johannes Schindelin
2008-06-20 7:38 ` [PATCH 1/2] git-merge-file --ours, --theirs Junio C Hamano
2008-06-20 7:48 ` [PATCH 2/2] git-merge-recursive-{ours,theirs} Junio C Hamano
2008-06-20 12:58 ` Johannes Schindelin
2008-06-21 9:46 ` Junio C Hamano
2008-06-21 16:29 ` Johannes Schindelin
2008-06-21 16:56 ` Jakub Narebski [this message]
2008-06-17 6:16 ` Guided merge with override Johannes Sixt
2008-06-17 8:53 ` Sverre Rabbelier
2008-06-17 9:48 ` Johannes Schindelin
2008-06-17 9:53 ` Sverre Rabbelier
2008-06-17 10:17 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2008-06-23 12:45 [PATCH 0/2] jc/merge-theirs, rebased on top of mv/merge-in-c Miklos Vajna
2008-06-23 12:45 ` [PATCH 2/2] git-merge-recursive-{ours,theirs} Miklos Vajna
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=m3zlpeloah.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=geoffrey.russell@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=sverre@rabbelier.nl \
--cc=vmiklos@frugalware.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).