diff --git a/dev/README-dev.txt b/dev/README-dev.txt index 04144931..eb781f11 100644 --- a/dev/README-dev.txt +++ b/dev/README-dev.txt @@ -1,16 +1,28 @@ -# Development tools to support KPhotoAlbum development +Development tools to support KPhotoAlbum development +==================================================== -## githooks + +dev/scripts +----------- + +This directory contains scripts useful for developing kphotoalbum. + +Scripts that are also useful to power users should usually go to the top level +scripts directory (e.g. kpa-backup.sh). + + +dev/githooks +------------ You can enable these hooks using the following command: ```` git config core.hooksPath ./dev/githooks/ ```` -Alternatively, you can copy the hooks into .git/hooks and manually keep them +Alternatively, you can copy the hooks into `.git/hooks` and manually keep them updated if needed. About the hooks: - 01-pre-commit: this is the default pre-commit hook supplied with git - 02-check-copyright-header will remind you to update copyright headers diff --git a/dev/scripts/neon-sync.sh b/dev/scripts/neon-sync.sh new file mode 100755 index 00000000..ba545e24 --- /dev/null +++ b/dev/scripts/neon-sync.sh @@ -0,0 +1,9 @@ +#!/bin/sh -e +# Sync the master branch with 5.x (the tracking branch for neon/dev-stable) + +echo "=== Updating Neon/dev-stable branch (5.x) ===" +git checkout 5.x +git pull +git merge master +git push +git checkout master