X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=PATCHES;h=74a76fdb4deed549058e56fb979c4c0722dc8779;hp=74fd696760e4631bf8d1f51f4c2f98f4108f20c7;hb=cfd79e96a6436cea427245a2c2f18fd52001898b;hpb=deda6ea50913b95deb536d5596037512584d13a7 diff --git a/PATCHES b/PATCHES index 74fd696760..74a76fdb4d 100644 --- a/PATCHES +++ b/PATCHES @@ -1,4 +1,4 @@ -// This file is part of the Doyxgen Developer Manual +// This file is part of the Doxygen Developer Manual /** @page patchguide Patch Guidelines Please mail patches to: @par @@ -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,