]> git.proxmox.com Git - libgit2.git/history - tests/merge/workdir/setup.c
bump version to 1.5.0+ds-6~bpo11+pve1
[libgit2.git] / tests / merge / workdir / setup.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
2021-12-10 Pirate PraveenUpdate upstream source from tag 'upstream/1.3.0+dfsg.1'
2021-12-10 Pirate PraveenNew upstream version 1.3.0+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'
2015-07-26 Russell SimMerge branch 'upstream'
2015-03-03 Edward ThomsonMerge pull request #2913 from ethomson/stash_fixup
2015-03-03 Carlos Martín NietoMerge pull request #2885 from JIghtuse/master
2015-02-20 Carlos Martín NietoMerge pull request #2907 from jasonhaslam/git_packfile_...
2015-02-19 Carlos Martín NietoMerge pull request #2820 from leoyanggit/mac_build
2015-02-15 Carlos Martín NietoMerge pull request #2831 from ethomson/merge_lock
2015-02-14 Edward Thomsonmerge: lock the index at the start of the merge
2015-02-13 Edward Thomsonmerge test: test an actual failure, not conflict
2014-11-18 Edward ThomsonMerge pull request #2654 from linquize/missing-obj
2014-11-09 Carlos Martín NietoMerge pull request #2653 from ethomson/contributing
2014-10-27 Carlos Martín NietoMerge commit 'refs/pull/2366/head' of github.com:libgit...
2014-10-27 Edward ThomsonMerge pull request #2482 from libgit2/ed/rebase
2014-10-27 Edward Thomsons/git_merge_head/git_annotated_commit
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-04 Vicent MartiMerge pull request #2211 from Yogu/retry-renaming-config
2014-04-01 Russell BelferMerge pull request #2208 from libgit2/vmg/mempack
2014-04-01 Vicent MartiMerge pull request #2206 from libgit2/cmn/inmemory...
2014-04-01 Edward ThomsonMerge pull request #2178 from libgit2/rb/fix-short-id
2014-03-31 Vicent MartiMerge pull request #2222 from ethomson/merge_head_id
2014-03-31 Edward ThomsonIntroduce git_merge_head_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 ThomsonRemove `git_merge_result` as it's now unnecessary
2014-03-20 Edward ThomsonChange signature of `git_merge` to take merge and check...
2014-03-20 Edward ThomsonRemove fastforward / uptodate from `git_merge`
2014-03-06 Vicent MartiMerge pull request #1997 from mgbowen/merge-options...
2014-02-12 Russell SimMerge tag 'upstream/0.20.0'
2014-02-05 Ben StraubMerge pull request #2027 from libgit2/rb/only-windows...
2014-01-27 Vicent MartiMerge pull request #2066 from libgit2/rb/builtin-diff...
2014-01-27 Vicent MartiMerge pull request #2075 from libgit2/cmn/leftover-oid
2014-01-25 Carlos Martín Nietomerge: rename _oid() -> id()
2013-11-20 Vicent MartiMerge branch 'development'
2013-11-14 Vicent MartíMerge pull request #1962 from libgit2/rename-tests
2013-11-14 Ben StraubRename tests-clar to tests