diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-13 12:40:31 +0200 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-13 12:40:31 +0200 |
commit | e6bffbc089d2cf0fe434a8da7bb1c9b88c9c5f4e (patch) | |
tree | cf70f17a7a3716b112a74952bb99b396859191cf | |
download | ghostscript-gpl-patches-e6bffbc089d2cf0fe434a8da7bb1c9b88c9c5f4e.tar.gz ghostscript-gpl-patches-e6bffbc089d2cf0fe434a8da7bb1c9b88c9c5f4e.tar.bz2 ghostscript-gpl-patches-e6bffbc089d2cf0fe434a8da7bb1c9b88c9c5f4e.zip |
Init.
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r-- | README.md | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/README.md b/README.md new file mode 100644 index 00000000..4b70c850 --- /dev/null +++ b/README.md @@ -0,0 +1,42 @@ +# Git Workflow + +## Adding a new major version + +``` +git checkout --orphan ghostscript-10 +git rm -rf . +tar -xaf /tmp/ghostscript-10.0.tar.xz -C . --strip-components=1 +find . -name '.gitignore' -delete +git add . +git commit -a -m "Import Ghostscript 10.0" --signoff +git commit --amend --date="$(stat --format='%y' /tmp/ghostscript-10.0.tar.xz)" +git tag -m "Ghostscript 10.0" -a ghostscript-10.0 +``` + +## Create patch set + +``` +git checkout ghostscript-9.50 +git checkout -b ghostscript-9.50-gentoo +# Make modifications +git commit -a --signoff +git format-patch ghostscript-9.50.. +mkdir /tmp/patches +mv *.patch /tmp/patches + +# As root +cd /tmp +chown root:root -R /tmp/patches +tar -caf ghostscript-gpl-9.50-patchset-01.tar.xz patches/ +``` + +## Re-spin patch set + +``` +# After new version was imported and tagged as ghostscript-9.52, +# start with checking out latest patch set +git checkout ghostscript-9.50-gentoo +# Create a new branch for our new patch set +git checkout -b ghostscript-9.52-gentoo +git rebase --onto ghostscript-9 ghostscript-9.52 +``` |