StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<blockquote> <p>But later when I checked the git graph, even if I followed the same workflow, all the chances were happening on the "master". No tree lines diverging and converging! </p> </blockquote> <p>Well... I do see some of your branches and merges.</p> <p>You will find in this <a href="http://kerneltrap.org/mailarchive/git/2007/12/15/510308" rel="nofollow noreferrer">page all the possible merge scenarios</a><br> (compiled at the time - late 2007 - by now SO contributor : <a href="https://stackoverflow.com/users/46058/jakub-narebski">Jakub Narębski</a>)</p> <p>You could be in a fast-forward case, which would explain why your merges will make all your commits appear to master once they are done:</p> <blockquote> <p>2/ Fast forward case; there are no commits A, B, C, and we start from the following situation:</p> </blockquote> <pre><code> 1---2---3 <-- trunk <-- HEAD \ \-a---b---c <-- branch </code></pre> <blockquote> <p>2.1/ "<code>git merge branch</code>"</p> </blockquote> <pre><code> 1---2---3 /----- trunk <-- HEAD \ v \-a---b---c <-- branch </code></pre> <blockquote> <p>Fast forward results in simply moving the head of trunk.<br> It does not create a commit, hence:</p> <p>2.2/ "<code>git merge --no-commit branch</code>"</p> <p>Like in 2.1, because fast-forwarding does not create a commit.</p> </blockquote> <p>So if you did not commit on master since you branched out, and then do a merge on master, all you do is resetting master HEAD...</p> <hr> <p>Another cause for branches to not be displayed is the "to-do list effect" described on the <a href="http://github.com/blog/39-say-hello-to-the-network-graph-visualizer" rel="nofollow noreferrer">presentation page of the <strong>GitHub Network Graph visualizer</strong></a> (which is the "git graph" you are referring to here)</p> <blockquote> <p><strong>But you are seeing each commit only once.</strong> Let that sink in for a second.<br> I find that many coders are so used to a centralized SCM that they miss the fact that our Graph Visualizer is actually showing and connecting disparate repositories. </p> <p><strong>If I draw the graph with myself as root, then the graph shows a sort of to-do list of code that I haven’t pulled into my repo yet.</strong><br> When I want to catch up on what the community has been doing in their forks of my repo, I can hit up the graph and see immediately what others have been up to.<br> <strong>If I were to pull in Bertg’s changes, the next time I see the graph, Bertg will no longer be shown at all because he will no longer have any commits that I do not.</strong><br> Keep thinking to-do list and you’ll understand the graph.</p> </blockquote> <p>So if that is true for merges from other repos branches (i.e. you do not see those branches anymore once they are merged), that may be true for merges from <em>your own</em> repo branches: once merged, you do not see them anymore in your graph. </p> <p>But I do, since: </p> <ul> <li>I am not the owner of the project.</li> <li>I may want to pull in my repo changes from any of your branches.</li> </ul>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload