diff options
| author | Yuval Adam <yuval@y3xz.com> | 2016-02-01 23:49:02 +0200 |
|---|---|---|
| committer | Yuval Adam <yuval@y3xz.com> | 2016-02-01 23:49:02 +0200 |
| commit | 8c4680de83ce1df8dc488c221aa2713aa3bb1bd8 (patch) | |
| tree | c910e149c9c3c59d0a0a9c1a302f054b5c60fd45 /pkg.sh | |
| parent | f45014cf5917cbf16eadc45b3a461ba8769e8093 (diff) | |
Try using plain subtree
Diffstat (limited to 'pkg.sh')
| -rwxr-xr-x | pkg.sh | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -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() { |
