[libdist-zilla-role-bootstrap-perl] 03/19: use pull instead of merge, despite not really being sure how it works

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to annotated tag 0.2.1-source
in repository libdist-zilla-role-bootstrap-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/libdist-zilla-role-bootstrap-perl.git