File tree Expand file tree Collapse file tree 2 files changed +21
-0
lines changed
Expand file tree Collapse file tree 2 files changed +21
-0
lines changed Original file line number Diff line number Diff line change 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.
Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments