X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-create.sh;h=2cab492d2be88aad03e5b5aa7b4101162ee645a7;hb=dfe1670c129c1ec6f46ae7b5cc610201a59cfbfd;hp=dd95e6596876d38e1357435267c46f67783ebbe0;hpb=2d9d79af9f312dbf94a848e3570f57002f6fb2b6;p=topgit.git diff --git a/tg-create.sh b/tg-create.sh index dd95e65..2cab492 100644 --- a/tg-create.sh +++ b/tg-create.sh @@ -82,7 +82,7 @@ while [ -n "$merge" ]; do info "Merging $name base with $branch..." if ! git merge "$branch"; then - info "Please commit merge resolution and call: tg create" + info "Please commit merge resolution and call: $tg create" info "It is also safe to abort this operation using:" info "git reset --hard some_branch" info "(You are on a detached HEAD now.)" @@ -123,4 +123,4 @@ git add -f "$root_dir/.topmsg" info "Topic branch $name set up. Please fill .topmsg now and make initial commit." -info "To abort: git rm -f .top* && git checkout ${deps%% *} && tg delete $name" +info "To abort: git rm -f .top* && git checkout ${deps%% *} && $tg delete $name"