Re: Confusing git log --- First time bug submission please advise on best practices

2014-02-07 Thread demerphq
On 7 February 2014 18:26, Duy Nguyen wrote: > On Fri, Feb 07, 2014 at 09:43:46AM +, Francis Stephens wrote: >> Thanks for your clear response. I can see where I went wrong now. > > Maybe something like this would help avoid confusion a bit in the > future? This toy patch puts a horizontal line

Re: Confusing git log --- First time bug submission please advise on best practices

2014-02-07 Thread Duy Nguyen
On Fri, Feb 07, 2014 at 09:43:46AM +, Francis Stephens wrote: > Thanks for your clear response. I can see where I went wrong now. Maybe something like this would help avoid confusion a bit in the future? This toy patch puts a horizontal line as a break between two commits if they are not relat

Re: Confusing git log --- First time bug submission please advise on best practices

2014-02-07 Thread Francis Stephens
Thanks for your clear response. I can see where I went wrong now. On Thu, Feb 6, 2014 at 4:10 PM, David Kastrup wrote: > Vincent van Ravesteijn writes: > >> The commits that are in the log for master and which are not in the >> log for originssh/master are merged in at "6833fd4 (HEAD, master); >

Re: Confusing git log --- First time bug submission please advise on best practices

2014-02-06 Thread David Kastrup
Vincent van Ravesteijn writes: > The commits that are in the log for master and which are not in the > log for originssh/master are merged in at "6833fd4 (HEAD, master); > Completed merge". > > As "git log" can only present the commits in a linear way, it shows > the commits from the ancentry of

Re: Confusing git log --- First time bug submission please advise on best practices

2014-02-06 Thread Vincent van Ravesteijn
On Thu, Feb 6, 2014 at 3:02 PM, Francis Stephens wrote: > > My co-worker has an inconsistent git log output. Please see that > attached files for output (I've made a best effort to remove > confidential info from them). > > Comparing the two log commands we can see that master and > originssh/mast

Confusing git log --- First time bug submission please advise on best practices

2014-02-06 Thread Francis Stephens
My co-worker has an inconsistent git log output. Please see that attached files for output (I've made a best effort to remove confidential info from them). Comparing the two log commands we can see that master and originssh/master have a shared common commit at (4 hours ago) d85832d More p