chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f3624d
)
tg update: Fix bogus advice on failed base update
author
Petr Baudis
<pasky@suse.cz>
Thu, 25 Sep 2008 18:50:36 +0000
(20:50 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Thu, 25 Sep 2008 18:50:36 +0000
(20:50 +0200)
tg-update.sh
patch
|
blob
|
history
diff --git
a/tg-update.sh
b/tg-update.sh
index f36624fe71b73263471e5df8fbb0014d47ca2ee0..24615a641cb7d3fe18b687dafd7e0b34e105a021 100644
(file)
--- a/
tg-update.sh
+++ b/
tg-update.sh
@@
-75,7
+75,7
@@
if [ -s "$depcheck" ]; then
info "Updating base with $dep changes..."
if ! git merge "$dep"; then
if [ -z "$TG_RECURSIVE" ]; then
- resume="\`$tg update\` again"
+ resume="\`
git checkout $name &&
$tg update\` again"
else # subshell
resume='exit'
fi