1 file changed
+1
-1
lines changed- .travis.yml+3
- CHANGELOG.md+1-24
- CMakeLists.txt+1-1
- CONTRIBUTING.md+1-16
- appveyor.yml+6-1
- examples/general.c+3-2
- include/git2/blob.h-43
- include/git2/commit.h-67
- include/git2/common.h+8
- include/git2/merge.h+1-10
- include/git2/odb.h+1-47
- include/git2/sys/merge.h-177
- script/appveyor-mingw.sh+3-1
- script/toolchain-mingw32.cmake+13
- src/blob.c+39-71
- src/commit.c+47-192
- src/config_file.c+16-39
- src/filebuf.c+1-6
- src/filebuf.h-1
- src/global.c-2
- src/ignore.c+11-3
- src/indexer.c-1
- src/merge.c+63-160
- src/merge.h+2-61
- src/merge_driver.c-396
- src/merge_driver.h-60
- src/merge_file.c+49-11
- src/odb.c+54-187
- src/pack.c-3
- src/refs.c+3
- src/transports/smart_protocol.c+61-17
- src/tree.c+2
- src/xdiff/xprepare.c+2-1
- tests/attr/ignore.c+13
- tests/commit/write.c-139
- tests/config/multivar.c+1-1
- tests/config/write.c+27
- tests/core/array.c+2
- tests/core/stream.c+6-2
- tests/index/nsec.c+9-51
- tests/merge/driver.c-388
- tests/merge/workdir/dirty.c+2-2
- tests/merge/workdir/simple.c-36
- tests/object/blob/fromchunks.c+156
- tests/object/blob/fromstream.c-103
- tests/odb/mixed.c-155
- tests/rebase/abort.c+5-26
- tests/rebase/merge.c-57
- tests/rebase/setup.c-205
- tests/refs/create.c+5-5
- tests/refs/lookup.c+8
- tests/repo/iterator.c+5
- tests/reset/hard.c+3-3
- tests/status/worktree.c+4-1
0 commit comments