I agree :) Our workflow is such that: - branch B should've been created from a point in time of branch A. I can't guarantee that that's what happened (as I understand it, it's hard to determine whether this is the case, as git doesn't care about this). - branch A should've been occasionally merged into branch B (to keep branch B refreshed). This did happen a few times.
The gist I uploaded was created via git log --format=%h\ %d --graph branchA branchB which I had run yesterday on the suggestion of the git IRC channel. I would need to do some more reading about the graph line format to understand what you are saying. But, in the meantime, maybe the output of this command will help: git log branchA...branchB --graph | grep "commit \|Date: \|Merge: " https://gist.github.com/cmurphycode/c1e581c04a89b7f5a679ad6e1ae1d7d6 On Monday, August 7, 2017 at 3:32:14 PM UTC-4, Igor Djordjevic wrote: > > Hi Chris, > > On Monday, August 7, 2017 at 5:28:15 PM UTC+2, Chris Murphy wrote: >> >> The history of the repo is quite tangled with many merges, but I uploaded >> it here (with sensitive info removed, sorry, it's a repo for my work) in >> case it helps: >> https://gist.github.com/cmurphycode/a75d7c4616a93be2bb4fd1096d162714 >> > > I find the history graph you`ve posted having a bit unusual layout, being > kind of hard to follow where did it branch, and where merges happened. How > did you produce it? > > For example, for a branching point here: > > * | 0abcc19bd9 > * | e783d2f321 > * 5daf5fedee > * c8cc2f3523 > > > I would expect something like this instead: > > * | 0abcc19bd9 > * | e783d2f321 > > |/ > * 5daf5fedee > * c8cc2f3523 > > > > And here, I guess there are some merges... or not? > > | | * ecdbbfcc3c > | | * 951eb3147d > | | * \ f2afcaf2c3 > | | * \ \ 0d94457c16 > | * | | | | 955537dbef > | * | | | | e59453329b > * | | | | | 03dd551f03 > > > > Regards, > Buga > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
