From 8c4680de83ce1df8dc488c221aa2713aa3bb1bd8 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Mon, 1 Feb 2016 23:49:02 +0200 Subject: Try using plain subtree --- pkg.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkg.sh') diff --git a/pkg.sh b/pkg.sh index 3d5563c..156328e 100755 --- a/pkg.sh +++ b/pkg.sh @@ -13,9 +13,7 @@ add_pkg() { [[ -z $pkgname ]] && usage git remote add -f $pkgname "ssh://aur@aur.archlinux.org/$pkgname.git" - git merge -s ours --no-commit "$pkgname/master" - git read-tree "--prefix=$pkgname/" -u "$pkgname/master" - git commit -m "Add $pkgname subtree" + git subtree add --prefix "aur/$pkgname" $pkgname master } update_pkg() { -- cgit v1.3.1