posts getting blocked again, just sending this to see if it gets through.
> On Feb 26, 2019, at 9:10 AM, Ryan Joseph <r...@thealchemistguild.com> wrote:
>
>
>
>> On Feb 26, 2019, at 7:05 AM, Graeme Geldenhuys
>> <mailingli...@geldenhuys.co.uk> wrote:
>>
>> Rather do as always recommended... develop in a "feature" branch.
>> Branches are brilliant in Git and most Git commands work better when
>> branches are used. Also split your changes into multiple smaller
>> commits. ie: your tests into one commit and your other changes into
>> another commit. Use commits - they don't cost anything, so no need to go
>> sparingly on them. ;-)
>
> I was actually in a feature branch already. I don’t know how it works but
> only changes made in the active branch (my feature branch) were added to the
> patch.
>
> What do you mean split changes into smaller commits? I’ve been working on
> this over months so there were dozens of commits. The final patch that was
> made had a history of all the commits but they were just packed into one file
> (which I thought was easier to distribute than a directory full of them).
>
> Still not sure how to keep the tests separate though. I added them in over
> time in a number of commits so it seems not possible to extract them now.
>
>>
>> Lastly, use the format-patch command but with branches instead.
>>
>> git format-patch -o output_directory --cover-letter
>> <feature_branch>...<master_branch>
>>
>> In will generate sequentially numbered set of .patch files in the
>> <output_directory> and a 0000-cover-letter.patch file. ie: a summary of
>> what you changed, which is useful for pasting into an email or mantis
>> report.
>
> Does this mean a .patch for each commit? Why is that better than merging into
> one patch?
>
>>
>> NOTE:
>> 1. Note the 3 dots between branch names
>> 2. <feature_branch> is the branch in which you did your work.
>> 3. <master_branch> is the branch you create your feature branch from.
>>
>>
>> Hope this helps.
Regards,
Ryan Joseph
_______________________________________________
fpc-pascal maillist - fpc-pascal@lists.freepascal.org
http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal
