chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0cc18da
)
better printing for dry run
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 15:53:06 +0000
(16:53 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 15:53:06 +0000
(16:53 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 12d3075faa37c8789e6404bc9bb1564b2ed9815f..f65b51a73f356fd50c47596fec8572cfdbf73972 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-548,7
+548,7
@@
sub pull () {
fetch();
runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
lrref();
fetch();
runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
lrref();
- print
"dgit ok: fetched to ".lrref()." and merged into HEAD\n
";
+ print
done "fetched to ".lrref()." and merged into HEAD
";
}
sub dopush () {
}
sub dopush () {