summaryrefslogtreecommitdiff
path: root/README.patches
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-06-30 21:50:25 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-06-30 21:50:25 +0200
commit992d33ec3638c791da1943bef74f4e129d7c3c46 (patch)
tree4c6d3861d76729049d38e3a67758c901c781adfe /README.patches
parent5bfe11d6ee59c8495cddd009197f003fd07da74f (diff)
parentdb0a6f1fd4012760cec0c580d9d9882c5c5012ea (diff)
downloadmediapointer-dvb-s2-992d33ec3638c791da1943bef74f4e129d7c3c46.tar.gz
mediapointer-dvb-s2-992d33ec3638c791da1943bef74f4e129d7c3c46.tar.bz2
merge...
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'README.patches')
-rw-r--r--README.patches6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.patches b/README.patches
index b6742b62c..53b5c8a8a 100644
--- a/README.patches
+++ b/README.patches
@@ -362,9 +362,9 @@ n) Sometimes, the maintainer may need to slightly modify patches you receive
add a line before his SOB, as stated on Documentation/SubmittingPatches,
describing what he did to merge it. Something like:
- Signed-off-by: Random J Developer <random@developer.example.org>
- [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
- Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
+ Signed-off-by: Random J Developer <random@developer.example.org>
+ [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
+ Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
5. Knowing about newer patches committed at master hg repository
=============================================================