/
githubmirror
/
redis
Обзор
Документация
Войти
/
githubmirror
/
redis
Код
Запросы
0
Пакеты
0
Релизы
0
Аналитика
Безопасность
unstable
.gitattributes
6 строк
405 B
yoav-steinberg
Fix commands.c build issue on merge (#10172)
25 янв 2022, 13:24
Не верифицирован
25 янв 2022, 13:24
d26453a
Код
Авторство
О чём код?
# We set commands.c's merge driver to `binary` so when it conflicts during a # merge git will leave the local version unmodified. This way our Makefile # will rebuild it based on src/commands/*.json before trying to compile it. # Otherwise the file gets modified and gets the same timestamp as the .json # files. So the Makefile doesn't attempt to rebuild it before compiling. src/commands.c merge=binary