diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2014-10-08 22:07:18 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2014-10-08 22:07:18 +0200 |
| commit | e6df80c67e13e8fbda8593f07dc51d0228664b04 (patch) | |
| tree | 2382c9307745235be4b9de983809b348f5b2e9d8 | |
| parent | 26e20bb9c495df23ff9c5ac95c7fe4586b215d2d (diff) | |
| download | zsh-e6df80c67e13e8fbda8593f07dc51d0228664b04.tar.gz zsh-e6df80c67e13e8fbda8593f07dc51d0228664b04.zip | |
Workflow: Ensure that the merge is fast-foward only
| -rw-r--r-- | debian/pkg-zsh-workflow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md index 3b1252ebd..1d621a0b1 100644 --- a/debian/pkg-zsh-workflow.md +++ b/debian/pkg-zsh-workflow.md @@ -228,7 +228,7 @@ When upstream releases a new version, we should follow these steps: % git checkout upstream % git pull origin % git fetch zsh - % git merge zsh-$version + % git merge --ff-only zsh-$version If that doesn't do a fast-forward merge, a fast-forward merge can be enforced as follows: |