diff options
| author | Andrew Murrell <merl@neo.andrewdm.me> | 2017-01-19 22:43:55 +0000 |
|---|---|---|
| committer | Andrew Murrell <merl@neo.andrewdm.me> | 2017-01-19 22:43:55 +0000 |
| commit | d00bf3265f192c93b0a15c8ac22cb11f8b10ccb8 (patch) | |
| tree | 502f2822d7fd9a9d7f7a983ae881d5de83dbbaf8 /bin | |
| parent | b92ce25d590af9d0ce4704eea16c7ded01f1b83f (diff) | |
added git pull to pre-generate
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 ) |