[libmoosex-has-sugar-perl] 05/120: use pull instead of merge, despite not really being sure how it works
Intrigeri
intrigeri at moszumanska.debian.org
Wed Aug 27 21:35:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to annotated tag 0.05070422-source
in repository libmoosex-has-sugar-perl.
commit ee34fda885e06ce4c1ebc3719bfce0d28ada52c1
Author: Kent Fredric <kentfredric at gmail.com>
Date: Tue Sep 10 13:07:06 2013 +1200
use pull instead of merge, despite not really being sure how it works
---
sync_tree.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sync_tree.pl b/sync_tree.pl
index 92b0678..28b91dd 100644
--- a/sync_tree.pl
+++ b/sync_tree.pl
@@ -16,9 +16,9 @@ if ( not -d -e $root->child("maint") ) {
);
} else {
system(
- 'git', 'subtree', 'pull',
- '--prefix=maint',
- 'https://github.com/kentfredric/travis-scripts.git', 'master'
+ 'git', 'subtree', 'merge',
+ '--prefix=maint', 'master'
+# 'https://github.com/kentfredric/travis-scripts.git', 'master'
);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmoosex-has-sugar-perl.git
More information about the Pkg-perl-cvs-commits
mailing list