diff options
| author | Thomas Schwinge <tschwinge@gnu.org> | 2009-08-03 10:12:53 +0200 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-08-03 10:14:26 +0200 |
| commit | 2d1088f2a65fd2dc27544bd835dae46576ec43df (patch) | |
| tree | 571d2386ac2428d0de55d720894ec050f617afd2 /rules/source_repositories.mdwn | |
| parent | 052eee8e4838901ea0bbf8cb3f532b1471f6738c (diff) | |
| parent | f3ce18edc806d916632a09eaa0826931290f2127 (diff) | |
Merge branch 'master' into master-news_next
Diffstat (limited to 'rules/source_repositories.mdwn')
| -rw-r--r-- | rules/source_repositories.mdwn | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/source_repositories.mdwn b/rules/source_repositories.mdwn index 1f228f7e..0d2911b2 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. |