Searched refs:merge (Results 1 – 8 of 8) sorted by relevance
83 * `-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`
275 change, branch_name, args.merge, args.pick))340 'merge_opt': args.merge,
82 can have an equivalent in another branch without being a merge107 * It does take into accounts merge conflict resolutions.
42 /* Experimental color saturation boosting merge
1586 postcss-merge-idents "^2.1.5"1587 postcss-merge-longhand "^2.0.1"1588 postcss-merge-rules "^2.0.3"2013 merge-descriptors "1.0.1"2027 utils-merge "1.0.1"3183 merge-descriptors@1.0.1:3185 …resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd…3878 postcss-merge-idents@^2.1.5:3880 …resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c553…3887 postcss-merge-longhand@^2.0.1:[all …]
305 def merge(self, other, outf_name): member in Crate1305 if c.merge(crate, 'Android.bp'):
79 without limitation the rights to use, copy, modify, merge, publish,358 without limitation the rights to use, copy, modify, merge, publish,433 …estriction, including without limitation the rights to use, copy, modify, merge, publish, distribu…468 rights to use, copy, modify, merge, publish, distribute, and/or sell copies of1229 including without limitation the rights to use, copy, modify, merge,1480 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell1972 ** without limitation the rights to use, copy, modify, merge, publish,3401 without limitation the rights to use, copy, modify, merge, publish, 4386 without limitation the rights to use, copy, modify, merge, publish,4612 copy, modify, merge, publish, distribute, sublicense, and/or sell[all …]
925 …5,platform/cts,fake_XS0O1HOETRCiH40ZBPoyOQ@fakeemail.com,Bring back logic removed by botched merge.1408 …,platform/cts,fake_azEGj8YKQBSfLqbiN8v8zg@fakeemail.com,"Revert ""resolve merge conflicts of 2537f…1492 …b14614236f,platform/cts,fake_OfUvxYOvTMClN9kUEG5V8w@fakeemail.com,resolve merge conflicts of ac55c…1558 …il.com,Fix for CTS/STS test b/35644815 This CL was created in response to the below merge conflict.1586 …PRXCII0r4QRQM8w@fakeemail.com,Adding month to delineation so as to remove merge conflicts when add…1910 …2c1872982,platform/cts,fake_HsnXKwO9RZOUlhGBMn393w@fakeemail.com,Manually merge go/aog/342830 into…2686 …@fakeemail.com,Merge: Add summary xml file to CTS results output Resolves merge conflict while mer…3876 …c7572,platform/cts,fake_HdcW5KCuTFS2dC3XmQhv4A@fakeemail.com,Refactor and merge PNG dumping in VD …4629 …81a4b966b,platform/cts,fake_HsnXKwO9RZOUlhGBMn393w@fakeemail.com,Manually merge preconditions shar…7252 …b039a534c7afff,platform/system/core,fake_GmY7H2GYTlKOrSutcsiEhQ@fakeemail.com,sdcard: Fix bad merge[all …]