summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-02-23 19:52:57 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-02-23 19:52:57 +0000
commit8d672afdebb54b1bdc3abb8e45311e7843ae7163 (patch)
tree2e45b99f1446c4296441b18b97af22358a1d5600 /www
parentdf194b0fc7365ab6c3f730c6c0213410853bee03 (diff)
downloadrockbox-8d672afdebb54b1bdc3abb8e45311e7843ae7163.tar.gz
rockbox-8d672afdebb54b1bdc3abb8e45311e7843ae7163.tar.bz2
rockbox-8d672afdebb54b1bdc3abb8e45311e7843ae7163.zip
Added text about -R/--reverse and --dry-run as suggested by Markus Braun
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3326 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'www')
-rw-r--r--www/docs/patch.t20
1 files changed, 18 insertions, 2 deletions
diff --git a/www/docs/patch.t b/www/docs/patch.t
index c7a59269a0..54e999abe4 100644
--- a/www/docs/patch.t
+++ b/www/docs/patch.t
@@ -40,8 +40,14 @@ changes done to multiple:
diff programs don't have that, and then -c (for 'context diff') is OK.
<h2>Submitting A Patch</h2>
-<p>All patches that are meant for inclusion in the sources should follow the
-format listed on the <a href="contributing.html">Contributing to Rockbox</a> page, and be posted to the <a href="http://sourceforge.net/tracker/?group_id=44306&atid=439120">patch tracker</a>. Patches sent to the mailing list are quickly lost in the traffic of the list itself.
+
+<p>All patches that are meant for inclusion in the sources should follow the
+format listed on the <a href="contributing.html">Contributing to Rockbox</a>
+page, and be posted to the <a
+href="http://sourceforge.net/tracker/?group_id=44306&atid=439120">patch
+tracker</a>. Patches sent to the mailing list are quickly lost in the traffic
+of the list itself.
+
<p>
Please keep in mind that not all submitted patches will be accepted.
@@ -69,5 +75,15 @@ manually.
patch -p2 < patchfile
</pre>
... each example line removes one extra level of dir info from the left.
+<p>
+ You can use the --dry-run option to patch to make sure that the patch applies
+clean. It doesn't actually apply the patch, only prints what would happen if
+you run it.
+<p>
+ You can remove a patch again from the sources by doing the reverse action of
+a specific patch. You do this with the -R (or --reverse) options, such as:
+<pre>
+ patch -p1 -R < patchfile
+</pre>
#include "foot.t"