Note that the direct ancestry path from tags/v1.0.0 to tags/v1.5.0 is empty since tags/v1.0.0 is not an ancestor of any of the starred commits. You might look for the merge base(s) between the two tags, then use -ancestry-path to select commits that are descendants of this merge base but ancestors of the second tag, and check to see whether any of those commits are reachable from other tags and if so what merge base(s) fall along the ancestry-path line. The fourth parent is the o that has the fork that leads to tags/v1.0.0, the fifth is a commit that is reachable from all names, and the sixth commit back along that first-parent axis comes before the part of the graph shown here.īecause your actual issue is not well-defined, it is hard to say what the correct approach might be. The first parent of the 1.5.0 commit is on master, the second parent is a merge commit on master, and the third parent is the main-line-row *. It moves back some number of first parent steps. The ~ operator is a graph-following operator. git diff tags/v1.5.0~count tags/v1.5.0 -name-only In this case, there are six such commits. The commits that are marked with a star * are reachable from the label tags/v1.5.0, by starting at the commit to which the label points and working backwards, following all paths (including the feature bubble). (Meanwhile master has continued to accumulate work.) Later, the feature was merged into master and since then release v1.5.0 was created and needed one commit to fix it up as well. Here, release v1.0.0 was created at about the same time as the feature bubble along the top, but then there were a few fixes needed. To illustrate the difference, suppose we have a graph fragment like this: *-*-* * <- tags/v1.5.0 No, it will give you the count of commits reachable from tags/v1.5.0 that are not reachable from tags/v1.0.0. which branches have cherry-picked that commit) thats git cherry. If you want to know which branches contain an 'equivalent' commit (i.e. This will give me the count of commits between these two tags. MatrixFrog comments that it only shows which branches contain that exact commit.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |