diff options
| author | Joakim Reinert <mail@jreinert.com> | 2015-05-21 19:50:10 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-22 12:02:13 +0200 |
| commit | cbb4753419746f401afab89e8e8dfc7459bb1c8f (patch) | |
| tree | 83311b2cabbb96d3baf15595f96d0ab8f99cd34a /INSTALL | |
| parent | 43b24a5122fea5cbe2a5aade02ab7c36f8f81499 (diff) | |
Change INSTALL doc to instruct running post-merge hook manually once
This renders running the update database command obsolete (it's already
run by the hook)
Diffstat (limited to 'INSTALL')
| -rw-r--r-- | INSTALL | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -8,8 +8,6 @@ * Change them to fit your needs - don't change config.php, use config-local.php to override it when needed -* run `php index.php tools update_database` to initialize your database - * Copy htaccess.txt to .htaccess if you want shorter URLs (also set "$config['index_page'] = '';" in config-local.php) @@ -24,3 +22,6 @@ * run `./scripts/install-git-hooks.sh` to install githooks. This will install hooks to run database migrations and optimize javascript when necessary on every git pull + +* run `./git-hooks/post-merge` to trigger the hook manually once in order to + initialize your database and optimize javascript |