tg update: Fix bogus advice on failed base update

[topgit.git] / tg-update.sh

diff --git a/tg-update.sh b/tg-update.sh
index f36624fe71b73263471e5df8fbb0014d47ca2ee0..24615a641cb7d3fe18b687dafd7e0b34e105a021 100644 (file)
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -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="\`git checkout $name && $tg update\` again"
                                else # subshell
                                        resume='exit'
                                fi