diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:28:16 -0800 |
| commit | 03f94ae9f909952ed5a78917ab319a312889354b (patch) | |
| tree | 0fd041e8b390bd0d2a960ae629d8e965d363de92 /contrib/examples/git-resolve.sh | |
| parent | commit, merge: initialize static strbuf (diff) | |
| parent | Move 'builtin-*' into a 'builtin/' subdirectory (diff) | |
| download | tgif-03f94ae9f909952ed5a78917ab319a312889354b.tar.xz | |
Update jk/maint-strbuf-missing-init to builtin/ rename
Diffstat (limited to 'contrib/examples/git-resolve.sh')
| -rwxr-xr-x | contrib/examples/git-resolve.sh | 2 |
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 |