Skip to content

Instantly share code, notes, and snippets.

@stephencroberts
Last active December 27, 2015 17:09
Show Gist options
  • Save stephencroberts/7360502 to your computer and use it in GitHub Desktop.
Save stephencroberts/7360502 to your computer and use it in GitHub Desktop.
Dev git post-merge
#!/bin/bash
# Apply stash to restore local develop.sql (or other changes)
git stash apply
git stash drop
# Which branch are we on?
branch=`git rev-parse --abbrev-ref HEAD`
php -f setup.php "$branch"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment