diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-09-20 12:50:25 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-09-22 10:28:04 +0200 |
| commit | 5f1e0dde32c4f42fe609433c42dcd6c412abb667 (patch) | |
| tree | b29e6789ec8628484765451e1c0a01d90ef705dd | |
| parent | 8191abac8ac55fd77dda99d3af4977938af2f748 (diff) | |
| download | automake-5f1e0dde32c4f42fe609433c42dcd6c412abb667.tar.gz | |
maint: 'master' should be merged into 'next'
* HACKING: Fix instructions merge instructions.
| -rw-r--r-- | HACKING | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -178,7 +178,7 @@ over-arching change, you should use a dedicated topic branch, and only merge that back once it is reasonably stable. -* The 'next' branch should be kept regularly merged into the 'master' +* The 'master' branch should be kept regularly merged into the 'next' branch. It is advisable to merge only after a set of related commits have been applied, to avoid introducing too much noise in the history. |