Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use libgit2 0.24.1
  • Loading branch information
pietbrauer committed Apr 15, 2016
commit 63db18b53a85ba9ae819babc923f68977c6f4aaf
2 changes: 1 addition & 1 deletion External/libgit2
Submodule libgit2 updated 54 files
+3 −0 .travis.yml
+1 −24 CHANGELOG.md
+1 −1 CMakeLists.txt
+1 −16 CONTRIBUTING.md
+6 −1 appveyor.yml
+3 −2 examples/general.c
+0 −43 include/git2/blob.h
+0 −67 include/git2/commit.h
+8 −0 include/git2/common.h
+1 −10 include/git2/merge.h
+1 −47 include/git2/odb.h
+0 −177 include/git2/sys/merge.h
+3 −1 script/appveyor-mingw.sh
+13 −0 script/toolchain-mingw32.cmake
+39 −71 src/blob.c
+47 −192 src/commit.c
+16 −39 src/config_file.c
+1 −6 src/filebuf.c
+0 −1 src/filebuf.h
+0 −2 src/global.c
+11 −3 src/ignore.c
+0 −1 src/indexer.c
+63 −160 src/merge.c
+2 −61 src/merge.h
+0 −396 src/merge_driver.c
+0 −60 src/merge_driver.h
+49 −11 src/merge_file.c
+54 −187 src/odb.c
+0 −3 src/pack.c
+3 −0 src/refs.c
+61 −17 src/transports/smart_protocol.c
+2 −0 src/tree.c
+2 −1 src/xdiff/xprepare.c
+13 −0 tests/attr/ignore.c
+0 −139 tests/commit/write.c
+1 −1 tests/config/multivar.c
+27 −0 tests/config/write.c
+2 −0 tests/core/array.c
+6 −2 tests/core/stream.c
+9 −51 tests/index/nsec.c
+0 −388 tests/merge/driver.c
+2 −2 tests/merge/workdir/dirty.c
+0 −36 tests/merge/workdir/simple.c
+156 −0 tests/object/blob/fromchunks.c
+0 −103 tests/object/blob/fromstream.c
+0 −155 tests/odb/mixed.c
+5 −26 tests/rebase/abort.c
+0 −57 tests/rebase/merge.c
+0 −205 tests/rebase/setup.c
+5 −5 tests/refs/create.c
+8 −0 tests/refs/lookup.c
+5 −0 tests/repo/iterator.c
+3 −3 tests/reset/hard.c
+4 −1 tests/status/worktree.c