[LLVMdev] Howdy + GIT

[Bruce Hoult]

On Fri, Jan 16, 2015 at 9:24 PM, Jeremy Lakeman <Jeremy.Lakeman at gmail.com>
 wrote:

> I looked at this, and my conclusion was that it would provide essentially
>> no benefit over svn + git mirrors + git-svn, while requiring *substantial*
>> work to ensure we end up with a clean, linear master history. Within the
>> community there has been long standing strong desire to continue to have
>> linear master history. Things like push and merge make the incremental
>> development and post-commit review process substantially harder.
>>
>>
> None of that is insurmountable. Though "out of the box" tools in git don't
> support that use case trivially, it certainly isn't impossible.
>
> A hook script to make sure master doesn't allow pushing any merge commits.
>

A linear master history is as simple as always using "git merge --no-ff
feature-branch". That creates a single commit on the master (current)
branch for the new feature, while allowing the interested to browse the
individual commits as they were made to the branch.

This article is worth reading:

http://nvie.com/posts/a-successful-git-branching-model/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20150116/1d1eed27/attachment.html>