From: Junio C Hamano <gitster@pobox.com>
To: Joey Hess <joey@kitenet.net>
Cc: GIT Mailing-list <git@vger.kernel.org>
Subject: Re: git-union-merge proposal
Date: Tue, 21 Jun 2011 13:19:28 -0700 [thread overview]
Message-ID: <7vaadb6ipb.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110621184101.GA12108@gnu.kitenet.net> (Joey Hess's message of "Tue, 21 Jun 2011 14:41:01 -0400")
Joey Hess <joey@kitenet.net> writes:
> 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.
I just said "I would prefer to see", so allowing or not allowing is up to
you ;-). If course I would prefer to see it not touch HEAD so that your
working envirnoment (checked out branch and the working tree) are not
disrupted. See my other message in the thread.
prev parent reply other threads:[~2011-06-21 20:19 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
2011-06-21 20:19 ` Junio C Hamano [this message]
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=7vaadb6ipb.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=joey@kitenet.net \
/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).