Searched refs:rebase (Results 1 – 7 of 7) 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/doc/contribute/ |
| D | contributor_expectations.rst | 17 - Easier to rebase and merge. Smaller PRs are less likely to conflict with other
139 Use interactive rebasing (git rebase -i) to clean up the commit history before submitting the
218 middle of a review. If a rebase is required, push this as a separate update
219 with no other changes since the last push of the PR. When pushing a rebase
220 only, add a comment to the PR indicating which commit is the rebase.
|
| D | guidelines.rst | 761 #. If reviewers do request changes to your patch, you can interactively rebase
764 git rebase -i <offending-commit-id>^
766 In the interactive rebase editor, replace ``pick`` with ``edit`` to select
775 git rebase --continue
785 merge conflict. If so, rebase your local branch::
788 git rebase --ignore-whitespace upstream/main
790 The ``--ignore-whitespace`` option stops ``git apply`` (called by rebase)
818 .. _git-rebase:
819 https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---keep-base
822 `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…
|
| /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
|
