summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rules/source_repositories.mdwn14
1 files changed, 14 insertions, 0 deletions
diff --git a/rules/source_repositories.mdwn b/rules/source_repositories.mdwn
index 2c2092f8..6240b422 100644
--- a/rules/source_repositories.mdwn
+++ b/rules/source_repositories.mdwn
@@ -51,6 +51,20 @@ Examples:
* `master-viengoos-on-bare-metal` -- port to Viengoos running on bare
metal; branched off of `master-viengoos` at some point
+ * unionfs
+
+ * `master` -- the mainline branch
+ * `master-unionmount` -- develop `unionmount` based on `unionfs`' master
+ branch
+
+To give a concrete example, the latter one was created like this:
+
+ $ git clone --no-checkout ssh://git.savannah.gnu.org/srv/git/hurd/unionfs.git
+ $ cd unionfs/
+ $ git checkout -b master-unionmount origin/master
+ $ ...
+ $ git push master-unionmount
+
## Merging
Merging between Git branches is trivial, at least as long as no conflicts