summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/examples/git-resolve.sh')
-rwxr-xr-xcontrib/examples/git-resolve.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh
index 0ee1bd898e..8f98142f77 100755
--- a/contrib/examples/git-resolve.sh
+++ b/contrib/examples/git-resolve.sh
@@ -48,7 +48,7 @@ case "$common" in
"$head")
echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $merge)"
git read-tree -u -m $head $merge || exit 1
- git update-ref -m "resolve $merge_name: Fast forward" \
+ git update-ref -m "resolve $merge_name: Fast-forward" \
HEAD "$merge" "$head"
git diff-tree -p $head $merge | git apply --stat
dropheads