From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 01:55:46 +0000 (+0000)
Subject: Merge branch 'fixes/independent-help' into refs/top-bases/i/basis-merge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=b2e44d38a26ac903441a6947f0f4c52610e77b3c

Merge branch 'fixes/independent-help' into refs/top-bases/i/basis-merge

Conflicts:
	tg.sh
---

b2e44d38a26ac903441a6947f0f4c52610e77b3c
diff --cc tg.sh
index ffc120a,734ddcc..838dc49
--- a/tg.sh
+++ b/tg.sh
@@@ -441,8 -450,9 +464,11 @@@ get_temp(
  [ -d "@cmddir@" ] ||
  	die "No command directory: '@cmddir@'"
  
+ # check if we should run help and get the topic while we're at it
+ help_topic="$(should_do_help "$@")" && { do_help "$help_topic"; exit 0; }
+ 
 +ensure_git_repo_or_die
 +
  ## Initial setup
  
  set -e