develooper Front page | perl.perl5.porters | Postings from June 2011

git merge no-ff references

Thread Next
From:
David Golden
Date:
June 13, 2011 14:31
Subject:
git merge no-ff references
Message ID:
BANLkTimg8JqRs9ZCerwQ29SZqp_Aw7B0hQ@mail.gmail.com
In the thread on squashing, "git merge --no-ff" was suggested.  I did
a little research and it's an interesting idea.

Here are some links I found useful:

* http://nvie.com/posts/a-successful-git-branching-model/
* http://nvie.com/posts/a-successful-git-branching-model/
* http://robey.lag.net/2009/11/29/more-git.html

I'm not sure what it does for bisecting and my "git-deltatool"
workflow, but the idea of using merge commits (suitably amended) as a
way of tracking related commits seems useful for perldelta and
cherry-picking, too.

-- David

Thread Next


nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About