/freebsd/tools/tools/git/ |
H A D | HOWTO | 67 Do not merge in other branches, or rebase your review branches at this point. 86 Next, do an interactive rebase to squash your code review fixes back into the 89 $ git rebase -i -k review_D1234_base 97 The rebase will not introduce any actual changes to your code if done 105 $ git pull --rebase origin master 107 It is not recommended that you combine this step with the rebase done in the 109 rebase that changes the commit that you branch from, it becomes much more 110 difficult to use the reflog to confirm that the interactive rebase did not
|
/freebsd/contrib/one-true-awk/ |
H A D | FREEBSD-upgrade | 19 % git pull --rebase 56 (5) Oops, lost the race to push while testing, the following will rebase things 58 % git rebase --rebase-merges -i freebsd/main
|
/freebsd/usr.bin/mkimg/tests/ |
H A D | Makefile | 33 rebase: partition_data_4M.bin ${_REBASE_SCRIPT} .PHONY target 35 /usr/libexec/atf-sh ${.OBJDIR}/${_REBASE_SCRIPT} -s ${.OBJDIR} rebase
|
H A D | mkimg_test.sh | 126 atf_test_case rebase 158 atf_add_test_case rebase
|
/freebsd/contrib/bc/tests/bc/errors/ |
H A D | 21.txt | 3 rebase=x
|
/freebsd/contrib/llvm-project/lld/MachO/ |
H A D | SyntheticSections.cpp | 169 : LinkEditSection(segment_names::linkEdit, section_names::rebase) {} in RebaseSection() 326 in.rebase->addEntry(isec, offset); in addNonLazyBindingEntries() 350 auto *rebase = reinterpret_cast<dyld_chained_ptr_64_rebase *>(buf); in writeChainedRebase() local 351 rebase->target = targetVA & 0xf'ffff'ffff; in writeChainedRebase() 352 rebase->high8 = (targetVA >> 56); in writeChainedRebase() 353 rebase->reserved = 0; in writeChainedRebase() 354 rebase->next = 0; in writeChainedRebase() 355 rebase->bind = 0; in writeChainedRebase() 359 uint64_t encodedVA = rebase->target | ((uint64_t)rebase->high8 << 56); in writeChainedRebase() 743 in.rebase->addEntry(in.lazyPointers->isec, in addBindingsForStub() [all …]
|
H A D | OutputSegment.cpp | 130 .Case(section_names::rebase, -10) in sectionOrder()
|
H A D | Writer.cpp | 714 in.rebase->addEntry(isec, r.offset); in scanRelocations() 805 in.rebase, in.binding, in.weakBinding, in.lazyBinding, in.exports)); in createLoadCommands() 1117 in.rebase, in.binding, in finalizeLinkEditSegment() 1360 in.rebase = make<RebaseSection>(); in createSyntheticSections()
|
H A D | InputSection.h | 358 constexpr const char rebase[] = "__rebase"; variable
|
H A D | SyntheticSections.h | 847 RebaseSection *rebase = nullptr; member
|
/freebsd/contrib/tcpdump/ |
H A D | CONTRIBUTING.md | 104 9) Try to rebase your commits to keep the history simple. 107 git rebase upstream/master 109 (If the rebase fails and you cannot resolve, issue `git rebase --abort`
|
/freebsd/contrib/llvm-project/llvm/tools/llvm-objdump/ |
H A D | ObjdumpOpts.td | 272 def rebase : Flag<["--"], "rebase">, 348 HelpText<"Print bind and rebase information used by dyld to resolve "
|
H A D | OtoolOpts.td | 43 HelpText<"print bind and rebase information">;
|
/freebsd/crypto/openssl/ |
H A D | CONTRIBUTING.md | 66 3. Patches should be as current as possible; expect to have to rebase
|
/freebsd/sys/contrib/openzfs/.github/ |
H A D | CONTRIBUTING.md | 136 [rebase](https://git-scm.com/docs/git-rebase) (squash).
|
/freebsd/sys/kern/ |
H A D | kern_cpuset.c | 1244 struct domainset *domain, bool rebase) in cpuset_setproc() argument 1278 if (set != NULL && rebase && tdroot != nroot) in cpuset_setproc() 1302 if (set != NULL && rebase && nroot != tdroot) { in cpuset_setproc()
|
/freebsd/contrib/kyua/ |
H A D | CONTRIBUTING.md | 59 * Make sure the history of your branch is clean. (Ab)use `git rebase -i master`
|
/freebsd/ |
H A D | CONTRIBUTING.md | 52 When updating your pull request, please rebase with a forced push rather than a
|
/freebsd/contrib/sqlite3/ |
H A D | sqlite3.c | 229104 SessionBuffer rebase; /* Rebase information (if any) here */ 229578 sessionAppendByte(&p->rebase, 'T', &rc); 229579 sessionAppendVarint(&p->rebase, p->nCol, &rc); 229580 sessionAppendBlob(&p->rebase, p->abPK, p->nCol, &rc); 229581 sessionAppendBlob(&p->rebase, (u8*)zTab, (int)strlen(zTab)+1, &rc); 229588 sessionAppendByte(&p->rebase, 229591 sessionAppendByte(&p->rebase, (eType==SQLITE_CHANGESET_REPLACE), &rc); 229599 sessionAppendValue(&p->rebase, pVal, &rc); 230169 assert( sApply.bRebase || sApply.rebase.nBuf==0 ); 230171 *ppRebase = (void*)sApply.rebase.aBuf; [all …]
|
/freebsd/share/dict/ |
H A D | web2 | 164171 rebase
|