chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
33c5ab5
cc57ff8
)
Merge branch 'fixes/independent-help' into refs/top-bases/i/basis-merge
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:55:46 +0000
(
01:55
+0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:55:46 +0000
(
01:55
+0000)
Conflicts:
tg.sh
1
2
tg.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tg.sh
index ffc120a9bedc18b0bde6501f4264c58fd1c92465,734ddcc7fd37577fa6f1a8923512445270ceb603..838dc49185be1fa81b288830ca950725d469ae10
---
1
/
tg.sh
---
2
/
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