summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2009-07-28 11:20:46 +0200
committerThomas Schwinge <tschwinge@gnu.org>2009-07-28 11:20:46 +0200
commitdf32f331eb56392c55e4d8aa59f8914399885496 (patch)
tree2fda42ddf795906c53056ff7baa6a67556166f57 /rules
parent3e2693546860d12d9b6976e173512ac9429fea51 (diff)
rules/source_repositories: Say why merging is good.
Diffstat (limited to 'rules')
-rw-r--r--rules/source_repositories.mdwn4
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/source_repositories.mdwn b/rules/source_repositories.mdwn
index 1f228f7..0d2911b 100644
--- a/rules/source_repositories.mdwn
+++ b/rules/source_repositories.mdwn
@@ -84,6 +84,10 @@ happen, the copyright of your changes has to be assigned to the Free Software
Foundation; read about the
[[copyright_assignment_process|savannah_group#copyright_assignment]].
+It is explicitly encouraged to *merge* changes from working branches into the
+mainline branches (as opposed to *rebase* them on top), as the former mode
+easily allows to determine the context under which a patch has been developed.
+
# Tags
Equivalent rules apply.