diff options
| author | Andrew Murrell <merl@neo.andrewdm.me> | 2017-01-14 03:02:57 +0000 |
|---|---|---|
| committer | Andrew Murrell <merl@neo.andrewdm.me> | 2017-01-14 03:02:57 +0000 |
| commit | ab4f2354874a41f0185690dfaffc42b0b3e73273 (patch) | |
| tree | bebb8754a1313fb04dd2b7c8a1d7777a52f34018 /bin/pre-generate | |
| parent | 2a5551197d9454fe3af296ea67b7279c0a3f5d43 (diff) | |
updated Psionist Title page
Diffstat (limited to 'bin/pre-generate')
| -rwxr-xr-x | bin/pre-generate | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/pre-generate b/bin/pre-generate index bd1c21e..ece3385 100755 --- a/bin/pre-generate +++ b/bin/pre-generate @@ -24,6 +24,8 @@ if [[ $branch == master ]]; then git add . git commit -m "make: $msg" + git checkout pre-generated + git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated git merge pre-generated.tmp |