Merge request 11 (ee5b38eb4ce21c50ce608caa7c0c965178497fe6 -> 532d5e88d833418fb5b9100ffe44a3829627814a)
By: anonymous
Against ref: refs/heads/dev
Date: 2020-08-26 04:39
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
gen doc 532d5e88d833418fb5b9100ffe44a3829627814a mucbuc 2020-08-26 04:39:14
remove whitespace 7b1ae117750424cf527bf7929a0a0cf1ef7221a5 mucbuc 2020-08-26 03:24:11
interface template e72eaf6bd8ff20a03b34ccc8659310fa7afba1dd mucbuc 2020-08-26 03:22:40
Commit 532d5e88d833418fb5b9100ffe44a3829627814a - gen doc
Author: mucbuc
Author date (UTC): 2020-08-26 04:39
Committer name: mucbuc
Committer date (UTC): 2020-08-26 04:39
Parent(s): 7b1ae117750424cf527bf7929a0a0cf1ef7221a5
Signer:
Signing key:
Signing status: N
Tree: eb3391d99e4951d2117c9b14b54d4ec2382985e6
File Lines added Lines deleted
blueprint/generate_doc 3 0
File blueprint/generate_doc added (mode: 100755) (index 0000000..5bf28bd)
1 #/usr/bin/env sh
2
3 doc-tool src_interface test_example > README.md
Commit 7b1ae117750424cf527bf7929a0a0cf1ef7221a5 - remove whitespace
Author: mucbuc
Author date (UTC): 2020-08-26 03:24
Committer name: mucbuc
Committer date (UTC): 2020-08-26 03:24
Parent(s): e72eaf6bd8ff20a03b34ccc8659310fa7afba1dd
Signer:
Signing key:
Signing status: N
Tree: 550407adeed5167873d52398aea183545dfe428d
File Lines added Lines deleted
blueprint/src/interface.h 2 2
File blueprint/src/interface.h changed (mode: 100644) (index 27c65fb..d1245e7)
3 3 #include <memory> #include <memory>
4 4
5 5 namespace om636 { namespace om636 {
6 namespace ${name}
6 namespace ${name}
7 7 { {
8 8
9 } // ${name}
9 } // ${name}
10 10 } // om636 } // om636
Commit e72eaf6bd8ff20a03b34ccc8659310fa7afba1dd - interface template
Author: mucbuc
Author date (UTC): 2020-08-26 03:22
Committer name: mucbuc
Committer date (UTC): 2020-08-26 03:22
Parent(s): ee5b38eb4ce21c50ce608caa7c0c965178497fe6
Signer:
Signing key:
Signing status: N
Tree: 839469ec84f6b4668fd852d1b14ffa15e2b548d9
File Lines added Lines deleted
blueprint/src/interface.h 10 0
templates.js 3 0
File blueprint/src/interface.h added (mode: 100644) (index 0000000..27c65fb)
1 #pragma once
2
3 #include <memory>
4
5 namespace om636 {
6 namespace ${name}
7 {
8
9 } // ${name}
10 } // om636
File templates.js changed (mode: 100755) (index 99d36c7..a13e916)
... ... function generateBuild(name) {
19 19 make('./blueprint/src/index.h', make('./blueprint/src/index.h',
20 20 {name}, {name},
21 21 'build/src/index.h'); 'build/src/index.h');
22 make('./blueprint/src/interface.h',
23 {name},
24 'build/src/interface.h');
22 25 } }
23 26
24 27 function make(source, context, dest) { function make(source, context, dest) {
Hints:
How to merge on your machine?
git fetch origin refs/mr/11:mr-11
git checkout main
git merge mr-11

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/11