From: martin f. krafft <madduck@madduck.net>
Date: Fri, 26 Sep 2008 18:07:33 +0000 (+0200)
Subject: Merge commit 'refs/top-bases/debian/locations' into debian/locations
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5aa8cf9d4fba8b6dbbd7878eb78b2600e3736b9a;p=topgit.git

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

Conflicts:

	tg.sh
---

5aa8cf9d4fba8b6dbbd7878eb78b2600e3736b9a
diff --cc tg.sh
index dcc0867,7005f98..ecc6574
--- a/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