Skip to content

Commit 3a090eb

Browse files
committed
Add a README and a sample config file
Add some instructions to show up on github. Signed-off-by: Amit Kucheria <[email protected]>
1 parent f05cb9e commit 3a090eb

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

README

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This repo contains the configuration file used by the `automerge` tool to
2+
merge the various git topic branches and create a new integration branch
3+
`qcom-next`
4+
5+
Please send patches to update the qcom-next.conf file as per your team
6+
needs.
7+
8+
There is also a ci.conf.sample file if you want to create your own
9+
configuration file for local integration testing.

ci.conf.sample

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# This file contains a list of branches to be merged into 'baseline', one
3+
# per line in the following format
4+
#
5+
# <user> <git url> <branch>
6+
#
7+
# A 'baseline' entry is mandatory.
8+
#
9+
# Example:
10+
#
11+
#baseline git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
12+
#john.doe http://git.linaro.org/people/john.doe/myfantasticrepo.git my-incredible-code

0 commit comments

Comments
 (0)