From 03c9e48f88fa8b681b77c6c35d6da0a0e838a7e8 Mon Sep 17 00:00:00 2001 From: dbrownell Date: Thu, 8 Oct 2009 00:13:50 +0000 Subject: Change most in-tree references from SVN to GIT. Also, talk about "mainline" not "trunk". The release.txt and release.sh files need more updates. git-svn-id: svn://svn.berlios.de/openocd/trunk@2825 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- PATCHES | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'PATCHES') diff --git a/PATCHES b/PATCHES index 74fd6967..32f1bda5 100644 --- a/PATCHES +++ b/PATCHES @@ -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, -- cgit v1.2.3