[Pkg-zsh-commits] [zsh] 14/26: Workflow: Ensure that the merge is fast-foward only
Axel Beckert
abe at deuxchevaux.org
Wed Oct 8 21:14:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch debian
in repository zsh.
commit e6df80c67e13e8fbda8593f07dc51d0228664b04
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Wed Oct 8 22:07:18 2014 +0200
Workflow: Ensure that the merge is fast-foward only
---
debian/pkg-zsh-workflow.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md
index 3b1252e..1d621a0 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:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git
More information about the Pkg-zsh-commits
mailing list