X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg.sh;h=2961106f735402d695043f31b32ffdef298566b3;hb=d26e617f9b07ee63f9faa41aebce5a2b1ad171b5;hp=545e1b8ec3d228cc2569090e651793dc45b77397;hpb=e7027d8adf2de0e318160fe1062c19c6a088c241;p=topgit.git

diff --git a/tg.sh b/tg.sh
index 545e1b8..2961106 100644
--- a/tg.sh
+++ b/tg.sh
@@ -222,10 +222,14 @@ do_help()
 			sep="|"
 		done
 
-		echo "TopGit v0.3 - A different patch queue manager"
+		echo "TopGit v0.5 - A different patch queue manager"
 		echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
-	elif [ -r "@sharedir@/tg-$1.txt" ] ; then
-		cat "@sharedir@/tg-$1.txt"
+	elif [ -r "@cmddir@"/tg-$1 ] ; then
+		@cmddir@/tg-$1 -h || :
+		echo
+		if [ -r "@sharedir@/tg-$1.txt" ] ; then
+			cat "@sharedir@/tg-$1.txt"
+		fi
 	else
 		echo "`basename $0`: no help for $1" 1>&2
 	fi
@@ -237,6 +241,8 @@ do_help()
 set -e
 git_dir="$(git rev-parse --git-dir)"
 root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
+# Make sure root_dir doesn't end with a trailing slash.
+root_dir="${root_dir%/}"
 base_remote="$(git config topgit.remote 2>/dev/null)" || :
 tg="tg"
 # make sure merging the .top* files will always behave sanely