diff options
| author | AndrewMurrell <ImFromNASA@gmail.com> | 2017-01-24 22:37:36 -0500 |
|---|---|---|
| committer | AndrewMurrell <ImFromNASA@gmail.com> | 2017-01-24 22:37:36 -0500 |
| commit | 9ce576387ea86232aef9539da0194c11850df820 (patch) | |
| tree | bcc269d6af5ea7804611c2374a627b04fc801581 /bin | |
| parent | a9df7c05f7d9950038cf8dba14434499ad7c5a6c (diff) | |
| parent | a2ef25d6bea13596d4c25e25cbe11e8d85a47219 (diff) | |
Merge branch 'master' of ssh://git.andrewdm.me/~git/www
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/pre-generate | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/pre-generate b/bin/pre-generate index ece3385..e5f8f5e 100755 --- a/bin/pre-generate +++ b/bin/pre-generate @@ -28,6 +28,7 @@ if [[ $branch == master ]]; then git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated + git pull git merge pre-generated.tmp git branch -d pre-generated.tmp ) |