Merge commit 'topgit-0.4'

[topgit.git] / tg-update.sh

diff --git a/tg-update.sh b/tg-update.sh
index 94c8b5d16d5521bc0105140a836dc931e7d8a018..f36624fe71b73263471e5df8fbb0014d47ca2ee0 100644 (file)
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -9,7 +9,7 @@ name=
 ## Parse options
 
 if [ -n "$1" ]; then
-       echo "Usage: tg update" >&2
+       echo "Usage: tg [...] update" >&2
        exit 1
 fi
 
@@ -75,7 +75,7 @@ if [ -s "$depcheck" ]; then
                        info "Updating base with $dep changes..."
                        if ! git merge "$dep"; then
                                if [ -z "$TG_RECURSIVE" ]; then
-                                       resume='`$tg update` again'
+                                       resume="\`$tg update\` again"
                                else # subshell
                                        resume='exit'
                                fi