Searched full:rebase (Results 1 – 19 of 19) sorted by relevance
| /Zephyr-latest/doc/develop/west/ |
| D | built-in.rst | 148 If you would rather rebase any locally checked out branches instead, use
149 the ``-r`` (``--rebase``) option.
157 ``west update --rebase`` will fail in projects that have git conflicts
160 ``git``, or you can use ``git -C <project_path> rebase --abort`` to
171 does not even try to rebase and leaves your branches behind just like a
173 - in all other projects where no rebase or merge is needed it keeps
208 whether you run ``west update`` with the ``--rebase`` option or without it:
212 # without --rebase, e.g. "west update":
215 # with --rebase, e.g. "west update --rebase":
216 git submodule update --init --rebase --recursive
[all …]
|
| D | workspaces.rst | 27 rebase it on top of a new ``manifest-rev``, or merge ``manifest-rev`` into
|
| /Zephyr-latest/.github/workflows/ |
| D | scripts_tests.yml | 37 - name: Rebase
45 rm -fr ".git/rebase-apply"
46 rm -fr ".git/rebase-merge"
47 git rebase origin/${BASE_REF}
|
| D | hello_world_multiplatform.yaml | 37 - name: Rebase
47 rm -fr ".git/rebase-apply"
48 rm -fr ".git/rebase-merge"
49 git rebase origin/${BASE_REF}
|
| D | coding_guidelines.yml | 42 rm -fr ".git/rebase-apply"
43 rm -fr ".git/rebase-merge"
44 git rebase origin/${BASE_REF}
|
| D | compliance.yml | 26 - name: Rebase onto the target branch
35 (echo "::error ::Merge commits not allowed, rebase instead";false)
36 rm -fr ".git/rebase-apply"
37 rm -fr ".git/rebase-merge"
38 git rebase origin/${BASE_REF}
|
| D | twister-prep.yaml | 69 rm -fr ".git/rebase-apply"
70 rm -fr ".git/rebase-merge"
71 git rebase origin/${BASE_REF}
|
| D | doc-build.yml | 88 - name: Rebase
97 rm -fr ".git/rebase-apply"
98 rm -fr ".git/rebase-merge"
99 git rebase origin/${BASE_REF}
|
| D | clang.yaml | 63 rm -fr ".git/rebase-apply"
64 rm -fr ".git/rebase-merge"
65 git rebase origin/${BASE_REF}
|
| D | bsim-tests.yaml | 80 rm -fr ".git/rebase-apply"
81 rm -fr ".git/rebase-merge"
82 git rebase origin/${BASE_REF}
|
| D | twister.yaml | 86 rm -fr ".git/rebase-apply"
87 rm -fr ".git/rebase-merge"
88 git rebase origin/${BASE_REF}
|
| /Zephyr-latest/doc/contribute/ |
| D | contributor_expectations.rst | 17 - Easier to rebase and merge. Smaller PRs are less likely to conflict with other
159 middle of a review. If a rebase is required, push this as a separate update
160 with no other changes since the last push of the PR. When pushing a rebase
161 only, add a comment to the PR indicating which commit is the rebase.
|
| D | guidelines.rst | 873 #. If reviewers do request changes to your patch, you can interactively rebase
876 git rebase -i <offending-commit-id>^
878 In the interactive rebase editor, replace ``pick`` with ``edit`` to select
887 git rebase --continue
897 merge conflict. If so, rebase your local branch::
900 git rebase --ignore-whitespace upstream/main
902 The ``--ignore-whitespace`` option stops ``git apply`` (called by rebase)
930 .. _git-rebase:
931 https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---keep-base
934 `git-rebase`_
|
| /Zephyr-latest/scripts/west_commands/completion/ |
| D | west-completion.zsh | 138 {-r,--rebase}'[rebase checked out branch onto the new manifest-rev]'
|
| D | west-completion.fish | 363 complete -c west -n "__zephyr_west_seen_subcommand_from update" -o r -l rebase -d "rebase checked o…
|
| D | west-completion.bash | 469 --rebase -r
|
| /Zephyr-latest/doc/develop/ |
| D | modules.rst | 125 *Rebase and merge*, or *Create a merge commit* option using Github UI). This
148 the *Rebase & merge* operation. This approach is simple and
|
| /Zephyr-latest/drivers/crypto/ |
| D | crypto_ataes132a.c | 125 LOG_ERR("response crc validation rebase" in ataes132a_send_command()
|
| /Zephyr-latest/doc/releases/ |
| D | release-notes-2.5.rst | 1678 …09` - series-push-hook.sh: Don't parse then-master-to-latest-master commits after rebase to lastest
|
