Re: [rdf4j-dev] REMINDER: Please use meaningful commit messages and/or s

[Jeen Broekstra <jeen.broekstra@xxxxxxxxx>]

Good point. I can try. I know you can’t ordinarily because a merge commit has two parents. But I believe there’s a command line option to indicate which parent to use as the base. 

I may need to chuck away the 2.0.2 release branch and start again if I can get this to work. 

Jeen

> On 14 Oct. 2016, at 10:22, Peter Ansell <ansell.peter@xxxxxxxxx> wrote:
> 
> Is it possible to cherry-pick just the relevant merge commits?
> 
> Cheers,
> 
> Peter
> 
> On 14 October 2016 at 10:06, Jeen Broekstra <jeen.broekstra@xxxxxxxxx> wrote:
>> I am having a hell of time cherrypicking things from the master branch to prep a release. On some feature branches there’s tons of commits with useless messages like “Fixes” or “code review” or “Merged”.
>> 
>> Can I remind everyone to always use, at the very least, the issue number in the message (preferably right at the front), so it’s easy for me to spot, in the history, which commits to pick for a certain fix?
>> 
>> If you can’t be bothered doing this all the time in your day-to-day workflow, that’s fine, but in that case please make sure that you squash your commits on your local branch/fork before you submit it for a PR - that way, you can clean up your commit messages “after the fact” (and it also make it easier to cherrypick, btw :)).
>> 
>> I may in future request you do a squash on your PR as part of the review.
>> 
>> Thanks,
>> 
>> Jeen
>> _______________________________________________
>> rdf4j-dev mailing list
>> rdf4j-dev@xxxxxxxxxxx
>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>> https://dev.eclipse.org/mailman/listinfo/rdf4j-dev
> _______________________________________________
> rdf4j-dev mailing list
> rdf4j-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/rdf4j-dev