Home
last modified time | relevance | path

Searched refs:merge (Results 1 – 9 of 9) sorted by relevance

/development/tools/winscope/src/traces/
DTransactions.ts52 if (event.merge) {
53 const merge = event.merge; constant
54 const originalId = merge.originalTransaction.id;
55 const mergedId = merge.mergedTransaction.id;
66 const merge = new Merge(originalId, mergedId, this.history); constant
67 this.addToHistoryOf(originalId, merge);
150 .map((merge) => merge.mergedId);
/development/tools/repo_pull/
DREADME.md83 * `-m` or `--merge` specifies the method to pick the merge commits. (default:
84 `merge-ff-only`)
86 * `-p` or `--pick` specifies the method to pick the non-merge commits.
90 * `merge` maps to `git merge --no-edit`
91 * `merge-ff-only` maps to `git merge --no-edit --ff-only`
92 * `merge-no-ff` maps to `git merge --no-edit --no-ff`
Drepo_pull.py275 change, branch_name, args.merge, args.pick))
340 'merge_opt': args.merge,
/development/tools/winscope/
Dwebpack.config.dev.js20 const { merge } = require('webpack-merge');
26 const webpackConfig = merge(commonConfig, {
Dwebpack.config.prod.js20 const {merge} = require('webpack-merge');
31 const webpackConfig = merge(commonConfig, {
Dyarn.lock1205 merge-source-map "^1.1.0"
2647 postcss-merge-longhand "^4.0.11"
2648 postcss-merge-rules "^4.0.3"
3223 lodash.merge "^4.6.2"
3340 merge-stream "^2.0.0"
3378 merge-descriptors "1.0.1"
3392 utils-merge "1.0.1"
4787 lodash.merge@^4.6.2:
4789 …resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0…
4948 merge-descriptors@1.0.1:
[all …]
/development/tools/repo_diff/
DREADME.md82 can have an equivalent in another branch without being a merge
107 * It does take into accounts merge conflict resolutions.
/development/samples/browseable/HdrViewfinder/src/rs/
Dhdr_merge.rscript42 /* Experimental color saturation boosting merge
/development/scripts/
Dcargo2android.py275 def merge(self, other, outf_name): member in Crate
1391 if c.merge(crate, 'Android.bp'):