X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=PATCHES;h=32f1bda5f070f0bee4b6a55f4b0d8a95b596a147;hp=ed980b856817ff09ae352024e091b3979954adee;hb=2dd9c5e1da3a7e9152e7ca45fefc73363b509d5a;hpb=b344ea9b97b52ea99227ece0eed9a3ece5516c7c diff --git a/PATCHES b/PATCHES index ed980b8568..32f1bda5f0 100644 --- a/PATCHES +++ b/PATCHES @@ -1,7 +1,7 @@ +// This file is part of the Doyxgen Developer Manual /** @page patchguide Patch Guidelines -Please mail patches to: - +Please mail patches to: @par openocd-development@lists.berlios.de Note that you can't send patches to that list unless @@ -9,9 +9,8 @@ you're a member, despite what the list info page says. @section Patch Guidelines in a Nutshell -The patch should be against svn trunk using an SVN -diff. If you use git-svn, a git diff or patch is OK -too; likewise a quilt patch, if you use quilt. +Your patches should be against git mainline. Submit output +of "git diff"; equivalently, quilt patches are OK. It should be a "good patch": focus it on a single issue, and make it be easily reviewable. Don't make @@ -34,18 +33,9 @@ Add yourself to the GPL copyright for non-trivial changes. To create a patch from the command line: @code - svn diff >mypatch.txt + git diff >mypatch.txt @endcode -See: @par - http://svnbook.red-bean.com/en/1.0/re09.html - -Remember to use "svn add" on new files first: @par - http://svnbook.red-bean.com/en/1.0/re01.html - -If you have a decent SVN GUI, then that should be -able to create and apply patches as well... - @section More Information on Patching The @ref primerpatches provides a more complete guide to creating,