You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branch:
unstable
2.2
2.4
2.6
2.8
3.0
3.2
4.0
5.0
6.0
6.2
7.0
acl-api-pr
acl-log
antiaffinity
aofrdb
argv-accounting
arm
client-unblock
conduct
cow-pipe
csc2
current-client-fix
dict-clustered-entries
dictc
dynamic-hz
faster-info
faster-rdb-loading
fix-double-multi
fix-expires-6537
free_clients_during_loading
freelist
issue_2175
latency
lazyfree
ldb
less-mstime
less-mstime-28
localtime
meaningful-offset
memsync
module-block-on-keys
module-blocking-commands
module-io-context
modules-get-client-info-by-id
modules-replication
multi-if
new-keyspace
no-mo-first
no-mo-second
nordb
nosync
o1-bpop
o1-bpop-5.0
onepass-bulk
precise-timeout
precise-timeout-2
psync2-test-improvement
queue-in-multi
rdb-script-aux
rdb9
rdbchanges
rssmaxmemory
sharedapi
siphash
slave-diskless
slave-script-timeout
strcompr
stream-propagation-fix
stream-propagation-fix-2
threaded-core-commands
tracking-noloop
unstable
unstable_hmset_args
wait-aof
waitpid-fix
zaddnx
ziplist-improvements
zunion
1.3.6
2.0.0
2.0.1
2.0.2
2.0.3
2.0.4
2.0.5
2.2-alpha0
2.2-alpha1
2.2-alpha2
2.2-alpha3
2.2-alpha4
2.2-alpha5
2.2-alpha6
2.2.0
2.2.0-rc1
2.2.0-rc2
2.2.0-rc3
2.2.0-rc4
2.2.1
2.2.10
2.2.105-scripting
2.2.106-scripting
2.2.107-scripting
2.2.11
2.2.110-scripting
2.2.111-scripting
2.2.12
2.2.13
2.2.14
2.2.15
2.2.2
2.2.3
2.2.4
2.2.5
2.2.6
2.2.7
2.2.8
2.2.9
2.3-alpha0
2.4.0
2.4.0-rc1
2.4.0-rc2
2.4.0-rc3
2.4.0-rc4
2.4.0-rc5
2.4.0-rc6
2.4.0-rc7
2.4.0-rc8
2.4.1
2.4.10
2.4.11
2.4.12
2.4.13
2.4.14
2.4.15
2.4.16
2.4.17
2.4.18
2.4.2
2.4.3
2.4.4
2.4.5
2.4.6
2.4.7
2.4.8
2.4.9
2.6.0
2.6.0-rc1
2.6.0-rc2
2.6.0-rc3
2.6.0-rc4
2.6.0-rc5
2.6.0-rc6
2.6.0-rc7
2.6.0-rc8
2.6.1
2.6.10
2.6.10-1
2.6.10-2
2.6.10-3
2.6.11
2.6.12
2.6.13
2.6.14
2.6.14-1
2.6.14-2
2.6.15
2.6.16
2.6.17
2.6.2
2.6.3
2.6.4
2.6.5
2.6.6
2.6.7
2.6.7-1
2.6.8
2.6.8-1
2.6.9
2.6.9-1
2.8.0
2.8.0-rc1
2.8.0-rc2
2.8.0-rc3
2.8.0-rc4
2.8.0-rc5
2.8.0-rc6
2.8.1
2.8.10
2.8.11
2.8.12
2.8.13
2.8.14
2.8.15
2.8.16
2.8.17
2.8.18
2.8.19
2.8.2
2.8.20
2.8.21
2.8.22
2.8.23
2.8.24
2.8.3
2.8.4
2.8.5
2.8.6
2.8.7
2.8.8
2.8.9
3.0-alpha0
3.0.0
3.0.0-beta1
3.0.0-beta2
3.0.0-beta3
3.0.0-beta4
3.0.0-beta5
3.0.0-beta6
3.0.0-beta7
3.0.0-beta8
3.0.0-rc1
3.0.0-rc2
3.0.0-rc3
3.0.0-rc4
3.0.0-rc5
3.0.0-rc6
3.0.1
3.0.2
3.0.3
3.0.4
3.0.5
3.0.6
3.0.7
3.2-rc1
3.2.0
3.2.0-rc2
3.2.0-rc3
3.2.1
3.2.10
3.2.11
3.2.12
3.2.13
3.2.2
3.2.3
3.2.4
3.2.5
3.2.6
3.2.7
3.2.8
3.2.9
4.0-rc1
4.0-rc2
4.0-rc3
4.0.0
4.0.1
4.0.10
4.0.11
4.0.12
4.0.13
4.0.14
4.0.2
4.0.3
4.0.4
4.0.5
4.0.6
4.0.7
4.0.8
4.0.9
5.0-rc1
5.0-rc2
5.0-rc3
5.0-rc4
5.0-rc5
5.0-rc6
5.0.0
5.0.1
5.0.10
5.0.11
5.0.12
5.0.13
5.0.14
5.0.2
5.0.3
5.0.4
5.0.5
5.0.6
5.0.7
5.0.8
5.0.9
6.0-rc1
6.0-rc2
6.0-rc3
6.0-rc4
6.0.0
6.0.1
6.0.10
6.0.11
6.0.12
6.0.13
6.0.14
6.0.15
6.0.16
6.0.2
6.0.3
6.0.4
6.0.5
6.0.6
6.0.7
6.0.8
6.0.9
6.2-rc1
6.2-rc2
6.2-rc3
6.2.0
6.2.1
6.2.2
6.2.3
6.2.4
6.2.5
6.2.6
6.2.7
7.0-rc1
7.0-rc2
7.0-rc3
7.0.0
7.0.1
7.0.2
twitter-20100804
twitter-20100825
v1.3.10
v1.3.11
v1.3.12
v1.3.7
v1.3.8
v1.3.9
v2.0.0-rc1
v2.0.0-rc1b
v2.0.0-rc2
v2.0.0-rc3
v2.0.0-rc4
v2.0.0-stable
v2.0.1-stable
v2.0.2-stable
v2.0.3-stable
v2.0.4-stable
v2.1.1-watch
vm-playpen
with-deprecated-diskstore
${ noResults }
redis/.gitattributes
6 lines
405 B
6 lines
405 B
# 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
|
|
|