Thread (1 message) 1 message, 1 author, 2016-06-15

Re: git-union-merge proposal

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:30

Joey Hess [off-list ref] writes:
Junio C Hamano wrote:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help