Commit 2c01967c authored by Axel Beckert's avatar Axel Beckert

debian/pkg-zsh-workflow-new-upstream-release.md fine-tuning

parent 638b2acf
...@@ -6,13 +6,16 @@ When upstream releases a new version, we should follow these steps: ...@@ -6,13 +6,16 @@ When upstream releases a new version, we should follow these steps:
### Merging new upstream tag (`zsh-$version`) into our upstream branch ### Merging new upstream tag (`zsh-$version`) into our upstream branch
% git checkout upstream % git checkout upstream
% git pull origin % git pull --ff-only origin
% git fetch zsh % git fetch zsh
% git merge --ff-only zsh-$version % git merge --ff-only zsh-$version
### Merging the branch upstream into the branch debian ### Merging the branch upstream into the branch debian
Merge `upstream` into `debian`: git merge upstream. Merge `upstream` into `debian`:
% git checkout debian
% git merge upstream
Make the commit message something like: Make the commit message something like:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment