]> git.proxmox.com Git - libgit2.git/history - tests/merge/files.c
bump version to 1.5.0+ds-6~bpo11+pve1
[libgit2.git] / tests / merge / files.c
2022-12-06 Fabian GrünbichlerMerge https://salsa.debian.org/debian/libgit2 into...
2022-08-28 Timo RöhlingUpdate upstream source from tag 'upstream/1.5.0+ds'
2022-08-28 Timo RöhlingNew upstream version 1.5.0+ds
2022-05-05 Mohammed BilalUpdate upstream source from tag 'upstream/1.4.3+dfsg.1'
2022-05-05 Mohammed BilalNew upstream version 1.4.3+dfsg.1
2020-12-06 Utkarsh GuptaNew upstream version 1.1.0+dfsg.1
2020-12-04 Utkarsh GuptaMerge branch 'debian/experimental' into debian/sid
2020-03-13 Utkarsh GuptaUpdate upstream source from tag 'upstream/0.99.0+dfsg.1'
2020-03-13 Utkarsh GuptaNew upstream version 0.99.0+dfsg.1
2019-05-11 Jongmin KimNew upstream version 0.28.1+dfsg.1
2019-05-11 Jongmin KimUpdate upstream source from tag 'upstream/0.28.1+dfsg.1'
2018-04-26 Pirate PraveenUpdate upstream source from tag 'upstream/0.27.0+dfsg.1'
2018-04-26 Pirate PraveenNew upstream version 0.27.0+dfsg.1
2016-04-03 Andreas HenrikssonMerge tag 'upstream/0.24.0'
2016-04-03 Andreas HenrikssonImported Upstream version 0.24.0
2015-12-01 Edward ThomsonMerge pull request #3508 from libgit2/cmn/tree-parse...
2015-11-30 Carlos Martín NietoMerge pull request #3513 from ethomson/merge_recursive
2015-11-25 Edward Thomsonmerge tests: move expected data into own file
2015-11-12 Carlos Martín NietoMerge pull request #3170 from CmdrMoozy/nsec_fix
2015-10-15 Carlos Martín NietoMerge pull request #3444 from ethomson/add_preserves_co...
2015-10-14 Edward ThomsonMerge pull request #3453 from libgit2/cmn/warn-python
2015-10-05 Edward ThomsonMerge pull request #3451 from ethomson/xdiff
2015-10-05 Edward Thomsondiff: don't feed large files to xdiff
2015-10-05 Edward Thomsonmerge_file: treat large files as binary
2015-08-10 Russell SimMerge tag 'upstream/0.23.1'
2015-08-01 Carlos Martín NietoMerge pull request #3333 from libgit2/cmn/for-v23
2015-07-28 Edward Thomsonmerge_files: don't add trailing newlines
2015-07-26 Russell SimMerge branch 'upstream'
2015-07-22 joshaberMerge branch 'master' into fix-init-ordering
2015-07-15 Edward ThomsonMerge pull request #3311 from Fallso/MacroRedefinition
2015-07-13 Carlos Martín NietoMerge pull request #3302 from libgit2/cmn/submodule...
2015-07-12 Carlos Martín NietoMerge branch 'portable-zu'
2015-07-11 Edward ThomsonMerge pull request #3292 from tkelman/patch-1
2015-07-10 Carlos Martín NietoMerge pull request #3297 from tkelman/patch-2
2015-07-09 Carlos Martín NietoMerge pull request #3281 from ethomson/wildcard_filters
2015-07-08 Carlos Martín NietoMerge pull request #3299 from ethomson/xdiff_update
2015-07-07 Edward Thomsonmerge_files: don't add trailing newlines
2015-04-24 Edward ThomsonMerge pull request #3071 from linquize/git_reflog_drop
2015-04-17 Edward ThomsonMerge pull request #2999 from pks-t/submodule-set-url
2015-04-10 Edward ThomsonMerge pull request #2974 from libgit2/cmn/clone-everything
2015-04-10 Edward ThomsonMerge pull request #3030 from linquize/symlink_supported
2015-03-24 Edward ThomsonMerge pull request #2990 from leoyanggit/custom_param
2015-03-24 Edward ThomsonMerge pull request #2986 from tkelman/mingw_winhttp
2015-03-24 Edward ThomsonMerge pull request #2947 from libgit2/cmn/notes-buf
2015-03-24 Carlos Martín NietoMerge pull request #3010 from ethomson/checkout_invalid...
2015-03-19 Carlos Martín NietoMerge pull request #2996 from ethomson/dll_comments
2015-03-18 Edward ThomsonMerge pull request #2967 from jacquesg/merge-whitespace
2015-03-16 Jacques GermishuysCollapse whitespace flags into git_merge_file_flags_t
2015-03-16 Jacques GermishuysAdded tests to merge files and branches with whitespace...
2014-06-21 Russell SimMerge tag 'upstream/0.21.0'
2014-06-20 Vicent Martilibgit2 v0.21.0
2014-06-11 Carlos Martín NietoMerge branch 'cmn/zlib-update' into cmn/update-zlib
2014-04-01 Edward ThomsonMerge pull request #2178 from libgit2/rb/fix-short-id
2014-03-25 Edward ThomsonMerge pull request #2181 from anuraggup/hide_cb
2014-03-24 Vicent MartiMerge pull request #2183 from ethomson/merge_refactor
2014-03-20 Edward ThomsonIntroduce git_merge_file for consumers