-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Am Do den 16. Aug 2012 um 15:51 schrieb Greg Troxel: > I would add, as suggestions: > > for complicated changes, people are encouraged to ask for review/test > of a branch before it is merged to master.
I always did this but seldom get response. :-) > when merging branches to master, use --no-ff in the git merge command, > so there will be an explicit merge commit. When one merges master to > a branch, checks that it still works, and then merges back to master, > often the merge back to master is a fast-forward merge and this is > boggling when going through the history. (I am running a large > private project where we use this rule, and it really helps; one can > 'git log --first-parent' and see all the direct master commits and > merge commits between releases, etc.) - --no-ff is sometimes a good idea, sometimes not. I think that should be used where it is reasonable. For example I might cherry-pick several commits fixing small thinks into a temp branch. As long as nobody did did something in master a ff might be reasonable. In other cases where there is a new feature --no-ff is the best way. Regards Klaus - -- Klaus Ethgen http://www.ethgen.ch/ pub 4096R/4E20AF1C 2011-05-16 Klaus Ethgen <kl...@ethgen.de> Fingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQGcBAEBCgAGBQJQLQ9UAAoJEKZ8CrGAGfasEbgL/jwzzHzSSpDqPGFNsPBqOHDy AXtWJwPdrjRyOxm0AJlXERnclmO05Ma9dO8zWX7MrF2FNXzbM9nsEapO9fYfzR1R FOeJITPS7MhQwDgeQ6akxN+yYTTtIJ2SXtrcCAOAmEwR9gwF1QZteHP1naT3xAuK X1PZQTfaYzSW/BdtPja7urVF2WO2OnzMUqyut9ZiJRzZtFGqNWGFutu/1AKXaSdf tRGOjnhgB3NRVHQTySQnBC8J6TjgHfjwOWKWwtxAbYSU/d0YQ1lReHGnodPxJYzV s9DnE38mDOAnbirdSSGZsXmFDpq08H6jyHgpunHoxWy2LmVt2y1jHk5JZLZRa1ao aH+XqVJlfBJIYVesMR0k3Msv49FcfCP90qqCZbvGZRvSS+nngaYC0HhiW9pCF0/2 u0FlDiroQkTp7kxO4k0fG7fUgoL58Lb2cQiAT+tnl6Nhz/S6y4F9KO38ieL6Q3Nu MJFvjfzRVKkmfdAg05nDTbP0LpomRA5reHqQldPogA== =R1Wt -----END PGP SIGNATURE----- ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
