...
For example, if you are generating patches for the Linux v5.4 kernel to apply against the Xilinx xlnx_rebase_v5.4 branch, the syntax is:
git rebase -i v5.4
...
In some cases, certain patches may not integrate easily with your existing code base and will require modification/adaptation before they can be utilized. In these cases, the git rebase
command can be used with the --continue
or --abort
flags to control how to handle these situations. For more information on these scenarios, please consult the official Git documentation at https://git-scm.com/docs/git-rebase.
Related Links
Official Git SCM Documentation - Basic Branching and Merging - https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merging
Official Git SCM Rebasing - https://git-scm.com/book/en/v2/Git-Branching-Rebasing
Some original source images adapted from Git-SCM.com Pro Git book, used under the Creative Commons CC-BY-NC-SA license. (https://creativecommons.org/licenses/by-nc-sa/3.0/)
...