Searched refs:squashed (Results 1 – 22 of 22) sorted by relevance
41 1. Grab the squashed commit that went into *aosp/master* and mark it44 **Note**: If there were changes to *aosp/master* before the squashed46 and finally repeat step 2 for changes after the squashed commit.89 10. Grab the squashed commit and replay it in *aosp/dev*.97 Use `-s ours` to ensure that we skip the squashed set of changes.
12 1. Do a squashed merge of *aosp/dev* to *aosp/master*.22 3. Grab the squashed commit and replay it in *aosp/dev*.30 Use `-s ours` to ensure that we skip the squashed set of changes.
25 squashed merge from the *dev* branch. Aside from updates, patches usually69 corresponding **external/** *aosp/master* project as a squashed single CL.
140 if (regions_[i].squashed != squashed_regions[i]) { in RecordAndCompareSquashed()141 regions_[i].squashed = squashed_regions[i]; in RecordAndCompareSquashed()170 if (region.squashed) in Dump()889 std::unique_ptr<DrmDisplayComposition> squashed = CreateComposition(); in ProcessWork() local890 ret = SquashFrame(composition.get(), squashed.get()); in ProcessWork()892 composition = std::move(squashed); in ProcessWork()
52 bool squashed = false; member
1 SQUASHFS 3.2 - A squashed read-only filesystem for Linux
1 SQUASHFS 4.0 - A squashed read-only filesystem for Linux
1 SQUASHFS 4.2 - A squashed read-only filesystem for Linux
1 SQUASHFS 3.0 - A squashed read-only filesystem for Linux
1 SQUASHFS 2.1 - A squashed read-only filesystem for Linux
1 SQUASHFS 3.1 - A squashed read-only filesystem for Linux
1 SQUASHFS 3.3 - A squashed read-only filesystem for Linux
6 SQUASHFS 2.0 - A squashed read-only filesystem for Linux
1 SQUASHFS 4.3 - A squashed read-only filesystem for Linux
1 SQUASHFS 4.1 - A squashed read-only filesystem for Linux
151 Note: This patch includes the following squashed commits from upstream:
187 memory leaks squashed (localtime pseudo leak is still there :-)
202 It turns out that these ``REV`` pairs can, in almost all cases, be squashed together into a single …
230 well. I believe all data-corruption bugs to be squashed, but I know full well
80 - mksquashfs: print file being squashed when ^\ (SIGQUIT) typed