Branching strategy for git

[John Ralls]

On Mar 25, 2014, at 9:52 AM, Dmitry Pavlov <zeldigas at gmail.com> wrote:

> Branch is just a pointer to head of revisions list (node in revision tree) . 
> So if you merge private branch in branch that is then pushed to public, it will be visible like this:
> http://git-scm.com/figures/18333fig0317-tn.png
> But without pointer to iss53

Yes, that’s what I said I thought was the case.* I’d have more confidence in that claim if the reference wasn’t figure 3.17 from http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging in the section “basic merging”. Unfortunately, Chacon doesn’t explicitly cover what the history on the remote will look like when one pushes the merge of a private branch, even in http://git-scm.com/book/en/Distributed-Git-Maintaining-a-Project#Integrating-Contributed-Work where he covers the subject explicitly; he seems to consider only the case where all branches are pushed, and he illustrates only what the local repo looks like.

Regards,
John Ralls

*Quibble: Not quite a pointer. More like a symbolic link in the file system or a database foreign key, because it contains the *name* of the commit, not its address. And not necessarily the head of the list; the commit pointed to may be the parent of another commit, as it is in the illustration.