Re: Are --first-parent and --ancestry-path compatible rev-list options?

2016-09-01 Thread Junio C Hamano
"Philip Oakley" writes: > The user question was, given a commit 'J', and a future commit 'H' > (typically a branch tip such as 'master'), find those commits that are > : > A) merges > B) on the first parent DAG chain of the future commit 'H' > C) children of the given

Re: Are --first-parent and --ancestry-path compatible rev-list options?

2016-09-01 Thread Junio C Hamano
"Philip Oakley" writes: > From: "Junio C Hamano" >> "Philip Oakley" writes: >> >>> The commit graph. We are looking for F based on knowing J. >>> >>> . A - B - C - D -- E -- F -- G - H<-first parent, --merges (C,F,H) >>> . \

Re: Are --first-parent and --ancestry-path compatible rev-list options?

2016-09-01 Thread Philip Oakley
Hi Junio, From: "Junio C Hamano" "Philip Oakley" writes: From: "Junio C Hamano" "Philip Oakley" writes: The commit graph. We are looking for F based on knowing J. . A - B - C - D -- E -- F -- G - H

Re: Are --first-parent and --ancestry-path compatible rev-list options?

2016-08-27 Thread Philip Oakley
From: "Junio C Hamano" "Philip Oakley" writes: The commit graph. We are looking for F based on knowing J. . A - B - C - D -- E -- F -- G - H<-first parent, --merges (C,F,H) . \ | /\// . Z | // . |

Re: Are --first-parent and --ancestry-path compatible rev-list options?

2016-08-26 Thread Junio C Hamano
"Philip Oakley" writes: > The commit graph. We are looking for F based on knowing J. > > . A - B - C - D -- E -- F -- G - H<-first parent, --merges (C,F,H) > . \ | /\// > . Z | // > . | | | / > . \ \

Are --first-parent and --ancestry-path compatible rev-list options?

2016-08-26 Thread Philip Oakley
While trying to answer a Stack Overflow question I thought I could contribute to, I've found a scenario that I don't understand that may be a bug. In http://stackoverflow.com/questions/39144006/identify-merge-into-master MvG asked how to find the point at which a commit on a feature branch