Re: Question about git log --merge option

2016-04-13 Thread Andrey Hsiao
Thanks Junio, I understand the option's meaning now :) On Thu, Apr 14, 2016 at 4:37 AM, Junio C Hamano wrote: > Andrey Hsiao writes: > >> Dear list: >> >> Just encountered the --merge option for git log. >> >> In the man page, it has the following explanation: >> - After a failed merge, show ref

Re: Question about git log --merge option

2016-04-13 Thread Junio C Hamano
Andrey Hsiao writes: > Dear list: > > Just encountered the --merge option for git log. > > In the man page, it has the following explanation: > - After a failed merge, show refs that touch files having a conflict > and don't exist on all heads to merge. git log --merge [options] -- $path

Question about git log --merge option

2016-04-13 Thread Andrey Hsiao
Dear list: Just encountered the --merge option for git log. In the man page, it has the following explanation: - After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge. I tried this option and get below results: 1. For a failed merge (with confl