diff options
Diffstat (limited to 'examples/redis-unstable/.gitattributes')
| -rw-r--r-- | examples/redis-unstable/.gitattributes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/redis-unstable/.gitattributes b/examples/redis-unstable/.gitattributes new file mode 100644 index 0000000..697a900 --- /dev/null +++ b/examples/redis-unstable/.gitattributes | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | # We set commands.c's merge driver to `binary` so when it conflicts during a | ||
| 2 | # merge git will leave the local version unmodified. This way our Makefile | ||
| 3 | # will rebuild it based on src/commands/*.json before trying to compile it. | ||
| 4 | # Otherwise the file gets modified and gets the same timestamp as the .json | ||
| 5 | # files. So the Makefile doesn't attempt to rebuild it before compiling. | ||
| 6 | src/commands.c merge=binary | ||