diff options
| author | Karel Zak | 2018-10-24 13:02:59 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-10-24 13:02:59 +0200 |
| commit | 84b27596f406be1daf82b52db845fe153348e601 (patch) | |
| tree | 26b48eb0a2a37c3e01ef872cccd98070b1830c35 | |
| parent | blkzone: fix report zones sector offset check (diff) | |
| download | kernel-qcow2-util-linux-84b27596f406be1daf82b52db845fe153348e601.tar.gz kernel-qcow2-util-linux-84b27596f406be1daf82b52db845fe153348e601.tar.xz kernel-qcow2-util-linux-84b27596f406be1daf82b52db845fe153348e601.zip | |
docs: add info about branches; update travis.yml
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Documentation/howto-contribute.txt | 23 |
2 files changed, 25 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 169596c64..a4f51f3ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,9 @@ matrix: branches: only: - master + - next - /^stable.*/ + - /^topic.*/ - /^travis.*/ before_install: diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt index e63d390c4..206ff582c 100644 --- a/Documentation/howto-contribute.txt +++ b/Documentation/howto-contribute.txt @@ -35,6 +35,29 @@ Sending Patches Packages like RPMs, DEBs, and the rest, are not provided. They should be available from the distribution. +Repositories & Branches + + * Primary repository is on kernel.org: + git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git + + We use this repository for master and stable branches only. + + * Backup repository at github.com: + git clone git://github.com/karelzak/util-linux.git + + We use this repository to backup kernel.org and for pull requests, + issues tracking and topic branches. The master and stable branches are + always pushed to the both repositories in the same time. + + It's recommended to use github.com for development. + + * Branches: + + master - development for the next release + next - optionally used when master branch is frozen due to -rcN releases + topic/* - long time development + stable/* - stable maintenance releases + Patching Process * announce it on the mailing list when you are going to work with some |