Home
last modified time | relevance | path

Searched full:rebase (Results 1 – 25 of 224) sorted by relevance

123456789

/external/coreboot/util/scripts/
Dgerrit-rebase35 custom_root='^Gerrit-Rebase-Ignore-CLs-Before:'
63 # start rebase process, but fail immediately by enforcing an invalid todo
64 GIT_SEQUENCE_EDITOR="echo 'Ignore this error, it works around a git-rebase limitation'>" \
65 git rebase -i --onto ${to} ${from} ${to} 2>/dev/null
67 # write new rebase todo
86 done | GIT_SEQUENCE_EDITOR="cat >" git rebase --edit-todo
89 git rebase --edit-todo
91 # start processing todo to mimick git rebase -i behavior
92 git rebase --continue
Dcross-repo-cherrypick2 # cross-repo-cherrypick - rebase helper script
14 # git rebase -i --exec util/scripts/cross-repo-cherrypick master
/external/pytorch/.github/scripts/
Dtryrebase.py16 …"\n```\nAborting rebase because rebasing the branch resulted in the same sha as the target branch.…
17 …+ "This usually happens because the PR has already been merged. Please rebase locally and push.\n…
24 parser = ArgumentParser("Rebase PR into branch")
34 msg = f"Tried to rebase and push PR #{pr.pr_num}, but it was already up to date."
42 msg += f"\n`@pytorchbot rebase -b {def_branch}`"
61 repo._run_git("rebase", onto_branch, branch)
80 + "git pull --rebase`)",
101 repo._run_git("rebase", onto_branch, orig_ref)
216 msg = f"@pytorchbot started a rebase job onto [{onto_branch}]({onto_branch_url})."
225 f"PR #{args.pr_num} is closed, won't rebase",
[all …]
Dtest_tryrebase.py30 "Tests rebase successfully"
36 mock.call("rebase", MAIN_BRANCH, "pull/31093/head"),
61 "Tests rebase to viable/strict successfully"
67 mock.call("rebase", VIABLE_STRICT_BRANCH, "pull/31093/head"),
98 mock.call("rebase", MAIN_BRANCH, "pull/31093/head"),
108 "Tried to rebase and push PR #31093, but it was already up to date",
132 … "Tried to rebase and push PR #31093, but it was already up to date. Try rebasing against [main]",
147 "Tests rebase results in same sha"
/external/cronet/android/tools/githooks/
Dpost-commit29 # HACK: checking for the existence of rebase-merge may not always work as
32 # grep for the "rebase in progress" string.
33 if [[ -d "$(git rev-parse --git-dir)/rebase-merge" ]]; then
34 # interactive rebase in progress.
35 echo "WARNING! .patch files are not updated during interactive rebase"
/external/pytorch/.github/workflows/
Dtryrebase.yml1 name: Rebase PR
5 types: [try-rebase]
35 - name: Rebase
55 python3 .github/scripts/comment_on_pr.py "${PR_NUM}" "rebase"
Dtrymerge.yml44 REBASE: ${{ github.event.client_payload.rebase }}
51 if [ -n "${REBASE}" ]; then
52 # attempt to rebase, if it fails then comment on the PR that it failed
53 if ! python3 .github/scripts/tryrebase.py "${PR_NUM}" --branch "${REBASE}"; then
/external/mesa3d/docs/
Drepository.rst133 would rebase your branch prior to merging with main. But for small
134 changes to the main branch itself, you also need to use the rebase
166 git pull --rebase
178 If the rebase resulted in conflicts or changes that could affect the
182 If you want the rebase action to be the default action, then
186 git config branch.main.rebase true
Dsubmittingpatches.rst173 to test this is to make use of the \`git rebase\` command, to run your
179 $ git rebase --interactive --exec "meson test -C build/" origin/main
199 Tick the following when creating the MR. It allows developers to rebase
433 - ``git rebase -i ...`` is your friend. Don't be afraid to use it.
440 git rebase -i --autosquash ...
446 git rebase -i --exec="ninja -C build/" HEAD~8
/external/openscreen/docs/
Dadvanced_gerrit.md131 git rebase -i origin/master # squash commits
139 git rebase -i C --onto M # squash commits
143 git rebase -i origin/master # squash commits and copy the Change-Id line from M
170 git rebase -i origin/master # squash commits, same note as M about Change-Id
173 git rebase # assume featureA is set as featureB's upstream branch
175 git rebase -i H --onto P
/external/crosvm/tools/
Dcl18 ./tools/cl [upload|rebase|status|prune]
26 of crosvm and helps rebase changes if needed.
38 fail if your commits do not apply cleanly. This tool can help rebase the changes, it will
41 [mybranch] $ ./tools/cl rebase
199 def rebase(): function
247 print("If gerrit rejects your changes, try `./tools/cl rebase -h`.")
270 run_commands(upload, rebase, status, prune, usage=USAGE)
/external/ltp/doc/developers/
Dtest_case_tutorial.rst265 Git-rebase, which allows us to clean up the commit history. So don't worry
771 After that we have the pleasure of doing an interactive ``rebase`` to clean up
780 tutorial and ``rebase`` it. You should try following along with your own
787 152d39fe7 (HEAD -> tutorial-rebase2, tutorial-rebase) tutorial: Start Submitting patch section
793 1e24a5fb5 (me/tutorial-rebase) fixup! tutorial
806 ``rebase`` and submitted a patch for review, so my original branch was just called
821 $ git rebase -i 5ca627b78\^
824 This begins an interactive ``rebase`` where commit ``5ca6427b78`` is the earliest
826 commit before this one. The interactive ``rebase`` command takes the last commit
857 file. If your ``rebase`` results in a merge conflict, then you have probably
[all …]
/external/clang/
DRenderScriptPrebuilts.md50 prebuilts generated for this rebase, or to the latest platform version if no
81 (i.e. without the rebase), push them to a device with the rebased tools, and
88 This ensures that the rebase did not break the 2.9 and 3.2 BitcodeWriters.
94 The following projects will almost always have CLs as a part of the rebase.
/external/ot-br-posix/
DCONTRIBUTING.md88 If any commits have been made to the upstream main branch, you should rebase your development branc…
95 # If there were any new commits, rebase your development branch
97 git rebase main
100 …wn into a small number of larger more cohesive commits. You can do this with an interactive rebase:
103 # Rebase all commits on your development branch
105 git rebase -i main
/external/openthread/
DCONTRIBUTING.md88 If any commits have been made to the upstream main branch, you should rebase your development branc…
95 # If there were any new commits, rebase your development branch
97 git rebase main
100 …wn into a small number of larger more cohesive commits. You can do this with an interactive rebase:
103 # Rebase all commits on your development branch
105 git rebase -i main
/external/angle/doc/
DCodeReviewProcess.md47 There should be no need to rebase via the "Rebase Change" button prior
56 * If this cherry pick fails, you will need to rebase the patch yourself
/external/llvm/test/tools/llvm-objdump/
Dmacho-rebase.test1 # RUN: llvm-objdump -macho -rebase -arch x86_64 \
2 # RUN: %p/Inputs/rebase.macho-x86_64 | FileCheck %s
/external/mesa3d/src/mesa/main/
Dformat_utils.c69 /* Takes a src to RGBA swizzle and applies a rebase swizzle to it. This
70 * is used when we need to rebase a format to match a different
73 * The rebase swizzle can be NULL, which means that no rebase is necessary,
78 * all 4-element swizzles, but the rebase swizzle can be NULL if no rebase
96 /* No rebase needed, so src2rgba is all that we need */ in compute_rebased_rgba_component_mapping()
102 * conversion that might involve a rebase swizzle.
106 * and possibly, a rebase swizzle.
108 * The final swizzle transform to apply (src2dst) when a rebase swizzle is
140 * the rebase swizzle to use in a format conversion based on the base
144 * \param map the rebase swizzle to consider
[all …]
/external/crosvm/tools/tests/
Dcl_tests.py75 cl("rebase").fg()
87 message = cl("rebase").stdout()
89 # `cl rebase` will overwrite the branch, but we should print the previous sha in case
/external/swiftshader/third_party/llvm-16.0/llvm/include/llvm/Object/
DMachO.h128 // Segment info so SegIndex/SegOffset pairs in a Mach-O Bind or Rebase entry
136 // Used to check a Mach-O Bind or Rebase entry for errors when iterating.
319 /// rebase, where rebases are mixed in with other
380 enum class FixupKind { Bind, Rebase }; enumerator
387 bool isRebase() const { return Kind == FixupKind::Rebase; } in isRebase()
541 /// For use iterating over all rebase table entries.
544 /// For use examining rebase opcodes in a MachOObjectFile.
583 // that fully contains a pointer at that location. Multiple fixups in a rebase
597 /// For use with the SegIndex of a checked Mach-O Bind or Rebase entry to
604 /// Rebase entry to get the section name.
[all …]
/external/coreboot/src/soc/amd/common/pi/
Dheapmanager.c60 AGESA_REBASE_PARAMS *Rebase; in agesa_HeapRebase() local
62 Rebase = (AGESA_REBASE_PARAMS *)ConfigPtr; in agesa_HeapRebase()
63 Rebase->HeapAddress = (uintptr_t)agesa_heap_base(); in agesa_HeapRebase()
64 if (!Rebase->HeapAddress) in agesa_HeapRebase()
65 Rebase->HeapAddress = CONFIG_PI_AGESA_CAR_HEAP_BASE; in agesa_HeapRebase()
/external/mesa3d/src/intel/compiler/
Dintel_nir_blockify_uniform_loads.c88 nir_def *rebase = nir_vec_scalars(b, components, orig_def_components); in rebase_const_offset_ubo_loads_instr() local
89 rebase->divergent = false; in rebase_const_offset_ubo_loads_instr()
91 nir_def_rewrite_uses_after(&intrin->def, rebase, rebase->parent_instr); in rebase_const_offset_ubo_loads_instr()
/external/ot-br-posix/.github/
Ddependabot.yml39 rebase-strategy: "disabled"
47 rebase-strategy: "disabled"
/external/skia/infra/bots/recipe_modules/checkout/examples/full.expected/
DBuild-Debian10-Clang-x86_64-Release-NoDEPS.json100 "rebase",
105 "name": "git rebase"
/external/pigweed/pw_build/
Drelative_source_file_names.gni41 # Rebase the paths so that they match those that are passed to the
43 rebase = root_build_dir

123456789