diff options
| author | Sem <sembrestels@riseup.net> | 2013-11-12 02:11:51 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-11-12 02:11:51 +0100 |
| commit | 69e2d8c5d8732042c9319aef1fdea45a82b63e42 (patch) | |
| tree | 60ab9be0af253fe757a4f3c473a4001736672e32 | |
| parent | e843405646960ffd1918d8191c5eba6219ba38b3 (diff) | |
| parent | adf5420ef563f7ba9db7c8759e9f540922d3e68b (diff) | |
| download | elgg-69e2d8c5d8732042c9319aef1fdea45a82b63e42.tar.gz elgg-69e2d8c5d8732042c9319aef1fdea45a82b63e42.tar.bz2 | |
Merge branch 'release/1.8.0'
| -rw-r--r-- | gpl-plugins | 20 | ||||
| -rwxr-xr-x | subtree.sh | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/gpl-plugins b/gpl-plugins new file mode 100644 index 000000000..925ca6ec2 --- /dev/null +++ b/gpl-plugins @@ -0,0 +1,20 @@ +videolist +dokuwiki +friendrequest +opensearch +identica +languages +registrationterms +custom_index_widgets +river_privacy +habitorio_theme +lightpics +colorbox +event_calendar +openid_client +openid_server +openid_api +beechat +simplepie +profile_widgets +html5 diff --git a/subtree.sh b/subtree.sh new file mode 100755 index 000000000..5151bb92c --- /dev/null +++ b/subtree.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +command=$1 +branch=$2 +plugin=$3 + +if [ ! $command ] || [ ! $branch ]; then + echo " Usage: ./subtree.sh <command> <branch> [<plugin-name>] + Example: ./subtree.sh pull develop etherpad" + exit +fi + +git checkout $branch +if [ $plugin ]; then + git subtree $command --prefix mod/$plugin git@gitorious.org:lorea/$plugin.git $branch +else + cat *-plugins | while read plugin; do + git subtree $command --prefix mod/$plugin git@gitorious.org:lorea/$plugin.git $branch + done +fi |