Merge commit 'refs/top-bases/debian/locations' into debian/locations

Conflicts:

	tg.sh

diff --cc Makefile
Simple merge

diff --cc tg.sh
index dcc08677939eb6b88da93c1291a4e80aa103e0d4,7005f98c882bde7c97094862aeb88b07b28de390..ecc65748141dd53a224f382f7d53ddcacb2ba65d
--- 1/tg.sh
--- 2/tg.sh
+++ b/tg.sh
@@@ -222,10 -222,14 +222,14 @@@ do_help(
                        sep="|"
                done
  
-               echo "TopGit v0.3 - A different patch queue manager"
+               echo "TopGit v0.4 - A different patch queue manager"
                echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
-         elif [ -r "@docdir@/tg-$1.txt" ] ; then
-                 cat "@docdir@/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"
++              if [ -r "@docdir@/tg-$1.txt" ] ; then
++                      cat "@docdir@/tg-$1.txt"
+               fi
        else
                echo "`basename $0`: no help for $1" 1>&2
        fi