X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-update.sh;h=24615a641cb7d3fe18b687dafd7e0b34e105a021;hp=f36624fe71b73263471e5df8fbb0014d47ca2ee0;hb=eafd8ec0bc6e50f452966ff3be0dde5ea863b640;hpb=5f3624dcccaa2397cc567ad3ddea0aba9087ca13

diff --git a/tg-update.sh b/tg-update.sh
index f36624f..24615a6 100644
--- 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