Thread (4 messages) flat view 4 messages, 4 authors, 2016-06-15

Re: finding the merge of two or more commits

From: Avery Pennarun <hidden>
Date: 2016-06-15 22:47:38

On Thu, Oct 29, 2009 at 5:12 PM, E R [off-list ref] wrote:
That is, I don't want to merge c1 and c2 myself, but I want to know if
someone else has merged c1 and c2, performed any conflict resolution
and committed the result.
Try this:

(git branch -a --contains c1; git branch -a --contains c2) | sort | uniq -d

It's not exactly pretty, but it works.

Have fun,

Avery
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help