23 lines
770 B
Bash
23 lines
770 B
Bash
|
|
git checkout Sandino-2023-07-08-base
|
|
git checkout -b gobmx-1.0-rebase-branch
|
|
git merge gob-mx-1.0
|
|
git checkout upstream
|
|
git tag Sandino-branch-point-2024-01-28
|
|
git checkout master
|
|
git rebase --onto Sandino-branch-point-2024-01-28 Sandino-2023-07-08-base gobmx-1.0-rebase-branch
|
|
git log --oneline --graph
|
|
|
|
git checkout Sandino-branch-point-2024-01-28
|
|
git checkout -b gobmx-1.0-backport-24.2
|
|
git merge gobmx-1.0-rebase-branch
|
|
git log --oneline --graph
|
|
git checkout master
|
|
git rebase --onto libreoffice-24-2-branch-point Sandino-branch-point-2024-01-28 gobmx-1.0-backport-24.2
|
|
git log --oneline --graph
|
|
|
|
git push --set-upstream origin gobmx-1.0-backport-24.2
|
|
|
|
mkdir ../patchset-gobmx-1.0_24.2
|
|
git format-patch -o ../patchset-gobmx-1.0_24.2 libreoffice-24-2-branch-point
|
|
|