fi
if [ "$(git symbolic-ref HEAD)" = "refs/heads/$branch" ]; then
- git merge $quiet --ff-only "$commit"
+ git merge $quiet --ff-only "$commit" --
else
if [ "$(git merge-base $branch_orig_hash $commit_orig_hash)" != "$branch_orig_hash" ]; then
echo "Error: merging $commit into $branch would not be a fast-forward" 1>&2
if git update-ref -m "merge $commit: Fast forward" "refs/heads/$branch" "$commit_orig_hash" "$branch_orig_hash"; then
if [ -z $quiet ]; then
echo "Fast forward"
- git diff --stat "$branch@{1}" "$branch"
+ git diff --stat "$branch@{1}" "$branch" --
fi
else
echo "Error: fast forward using update-ref failed" 1>&2
case $# in
2 ) _merge_ff "$1" "$2";;
* ) _usage
-esac
\ No newline at end of file
+esac