From: Joey Hess <joey@kitenet.net>
To: GIT Mailing-list <git@vger.kernel.org>
Subject: Re: git-union-merge proposal
Date: Tue, 21 Jun 2011 14:41:01 -0400 [thread overview]
Message-ID: <20110621184101.GA12108@gnu.kitenet.net> (raw)
In-Reply-To: <7v4o3j9izr.fsf@alter.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
Junio C Hamano wrote:
> In other words, I would prefer to see something like:
>
> $ git merge --index-only [-s <strategy>] <other_branch>
Would this allow merging changes into a branch other than HEAD? If so, I
agree, I'd prefer to see it in git-merge itself if possible.
--
see shy jo
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next prev parent reply other threads:[~2011-06-21 18:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-21 2:20 git-union-merge proposal Joey Hess
2011-06-21 5:22 ` Jonathan Nieder
2011-06-21 7:34 ` Johan Herland
2011-06-21 16:10 ` Joey Hess
2011-06-21 17:44 ` Junio C Hamano
2011-06-21 18:12 ` Junio C Hamano
2011-06-21 18:41 ` Joey Hess [this message]
2011-06-21 20:19 ` 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=20110621184101.GA12108@gnu.kitenet.net \
--to=joey@kitenet.net \
--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).