[fpc-pascal] Multi helpers
Graeme Geldenhuys
mailinglists at geldenhuys.co.uk
Tue Feb 26 13:05:41 CET 2019
On 25/02/2019 19:08, Ryan Joseph wrote:
> git format-patch master --stdout > patch.diff
Yuck!
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. ;-)
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.
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,
Graeme
--
fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal
http://fpgui.sourceforge.net/
My public PGP key: http://tinyurl.com/graeme-pgp
More information about the fpc-pascal
mailing list