summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuval Adam <yuval@y3xz.com>2016-02-01 23:49:02 +0200
committerYuval Adam <yuval@y3xz.com>2016-02-01 23:49:02 +0200
commit8c4680de83ce1df8dc488c221aa2713aa3bb1bd8 (patch)
treec910e149c9c3c59d0a0a9c1a302f054b5c60fd45
parentf45014cf5917cbf16eadc45b3a461ba8769e8093 (diff)
Try using plain subtree
-rwxr-xr-xpkg.sh4
1 files changed, 1 insertions, 3 deletions
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() {