CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

droplets: Always rebase instead of merge during git pull.

Browse Source
This commit is contained in:
Vishnu Ks 2017-11-16 23:04:16 +00:00 committed by Tim Abbott
parent 3828305305
commit 75601f660d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/droplets/create.py
View File

@ -115,6 +115,7 @@ def set_user_data(username, userkeys):
runcmd:
- su -c 'cd /home/zulipdev/zulip && {2} https://github.com/{0}/zulip.git && git fetch origin' zulipdev
- su -c 'git config --global core.editor nano' zulipdev
- su -c 'git config --global pull.rebase true' zulipdev
power_state:
mode: reboot
condition: True