Re: [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
I have another suggestion related to commit messages. Generally git commit messages follow following template: - First line contains summary of the change After one empty line there is more or less free-form text describing the commit in more detail. This can include: * lists * urls * basically anything But commiters should always treat first line of commit message the same way they treat subjects of emails: Try to summarize the commit in <80 characters. No bullet points, no dashes in the beginning etc. - git format-patch sort of assumes this template when generating patches. I am not sure where this might be written down, but I believe it would improve readability of commit logs slightly :-) Quoting Olivier Lamy (2012-11-30 09:04:51) > In the future could we avoid those non necessary commit ? > I have started a git convention page here: > http://maven.apache.org/developers/conventions/git.html > See the workflow section. > All fixes/improvements for this doc will be appreciate :-) > > 2012/11/30 : > > Updated Branches: > > refs/heads/master 1fe432b5d -> af88f8500 > > > > > > Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven > > > > > > Project: http://git-wip-us.apache.org/repos/asf/maven/repo > > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/af88f850 > > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/af88f850 > > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/af88f850 > > > > Branch: refs/heads/master > > Commit: af88f8500d5ba23a6b68773e12f38e832d0d7ea9 > > Parents: 97e8ae2 1fe432b > > Author: Jason van Zyl > > Authored: Thu Nov 29 15:08:30 2012 -0800 > > Committer: Jason van Zyl > > Committed: Thu Nov 29 15:08:30 2012 -0800 > > > > -- > > > > -- > > > > > > > > -- > Olivier Lamy > Talend: http://coders.talend.com > http://twitter.com/olamy | http://linkedin.com/in/olamy > > - > To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org > For additional commands, e-mail: dev-h...@maven.apache.org -- Stanislav Ochotnicky Software Engineer - Base Operating Systems Brno PGP: 7B087241 Red Hat Inc. http://cz.redhat.com - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Patches generated with git-format-patch will retain original author when applied. This is what we require in m2e for example, it makes much easier to credit code contributions and generate stats reports. Patches generated with git-diff (or plain diff, for that matter) do not have author information. It is possible to tell git to attribute a commit to somebody else, but I usually request to resubmit git-format-patch formatted patch. -- Regards, Igor On 12-11-30 3:36 AM, Anders Hammar wrote: A question from a git rookie: If we're applying a proper git patch, then the "submitted by" row shouldn't be required in the commit message as git will handle this. Right? /Anders On Fri, Nov 30, 2012 at 9:04 AM, Olivier Lamy wrote: In the future could we avoid those non necessary commit ? I have started a git convention page here: http://maven.apache.org/developers/conventions/git.html See the workflow section. All fixes/improvements for this doc will be appreciate :-) 2012/11/30 : Updated Branches: refs/heads/master 1fe432b5d -> af88f8500 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/af88f850 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/af88f850 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/af88f850 Branch: refs/heads/master Commit: af88f8500d5ba23a6b68773e12f38e832d0d7ea9 Parents: 97e8ae2 1fe432b Author: Jason van Zyl Authored: Thu Nov 29 15:08:30 2012 -0800 Committer: Jason van Zyl Committed: Thu Nov 29 15:08:30 2012 -0800 -- -- -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
A question from a git rookie: If we're applying a proper git patch, then the "submitted by" row shouldn't be required in the commit message as git will handle this. Right? /Anders On Fri, Nov 30, 2012 at 9:04 AM, Olivier Lamy wrote: > In the future could we avoid those non necessary commit ? > I have started a git convention page here: > http://maven.apache.org/developers/conventions/git.html > See the workflow section. > All fixes/improvements for this doc will be appreciate :-) > > 2012/11/30 : > > Updated Branches: > > refs/heads/master 1fe432b5d -> af88f8500 > > > > > > Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven > > > > > > Project: http://git-wip-us.apache.org/repos/asf/maven/repo > > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/af88f850 > > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/af88f850 > > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/af88f850 > > > > Branch: refs/heads/master > > Commit: af88f8500d5ba23a6b68773e12f38e832d0d7ea9 > > Parents: 97e8ae2 1fe432b > > Author: Jason van Zyl > > Authored: Thu Nov 29 15:08:30 2012 -0800 > > Committer: Jason van Zyl > > Committed: Thu Nov 29 15:08:30 2012 -0800 > > > > -- > > > > -- > > > > > > > > -- > Olivier Lamy > Talend: http://coders.talend.com > http://twitter.com/olamy | http://linkedin.com/in/olamy > > - > To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org > For additional commands, e-mail: dev-h...@maven.apache.org > >
Re: [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
In the future could we avoid those non necessary commit ? I have started a git convention page here: http://maven.apache.org/developers/conventions/git.html See the workflow section. All fixes/improvements for this doc will be appreciate :-) 2012/11/30 : > Updated Branches: > refs/heads/master 1fe432b5d -> af88f8500 > > > Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven > > > Project: http://git-wip-us.apache.org/repos/asf/maven/repo > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/af88f850 > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/af88f850 > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/af88f850 > > Branch: refs/heads/master > Commit: af88f8500d5ba23a6b68773e12f38e832d0d7ea9 > Parents: 97e8ae2 1fe432b > Author: Jason van Zyl > Authored: Thu Nov 29 15:08:30 2012 -0800 > Committer: Jason van Zyl > Committed: Thu Nov 29 15:08:30 2012 -0800 > > -- > > -- > > -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
