diff options
Diffstat (limited to 'debian/pkg-zsh-workflow.md')
| -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: |