]> git.proxmox.com Git - libgit2.git/history - tests/merge
projects / libgit2.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
re-enable SSH support
[libgit2.git] / tests / merge /
2022-05-05 Mohammed BilalUpdate upstream source from tag 'upstream/1.4.3+dfsg.1' tree | commitdiff
2022-05-05 Mohammed BilalNew upstream version 1.4.3+dfsg.1 tree | commitdiff
2021-12-10 Pirate PraveenUpdate upstream source from tag 'upstream/1.3.0+dfsg.1' tree | commitdiff
2021-12-10 Pirate PraveenNew upstream version 1.3.0+dfsg.1 tree | commitdiff
2020-12-06 Utkarsh GuptaUpdate upstream source from tag 'upstream/1.1.0+dfsg.1' tree | commitdiff
2020-12-06 Utkarsh GuptaNew upstream version 1.1.0+dfsg.1 tree | commitdiff
2020-12-04 Utkarsh GuptaMerge branch 'debian/experimental' into debian/sid tree | commitdiff
2020-10-09 Utkarsh GuptaUpdate upstream source from tag 'upstream/1.0.1+dfsg.1' tree | commitdiff
2020-10-09 Utkarsh GuptaNew upstream version 1.0.1+dfsg.1 tree | commitdiff
2020-03-13 Utkarsh GuptaUpdate upstream source from tag 'upstream/0.99.0+dfsg.1' tree | commitdiff
2020-03-13 Utkarsh GuptaNew upstream version 0.99.0+dfsg.1 tree | commitdiff
2019-05-11 Jongmin KimNew upstream version 0.28.1+dfsg.1 tree | commitdiff
2019-05-11 Jongmin KimUpdate upstream source from tag 'upstream/0.28.1+dfsg.1' tree | commitdiff
2018-04-26 Pirate PraveenUpdate upstream source from tag 'upstream/0.27.0+dfsg.1' tree | commitdiff
2018-04-26 Pirate PraveenNew upstream version 0.27.0+dfsg.1 tree | commitdiff
2017-07-29 Russell SimMerge tag 'upstream/0.26.0+dfsg.1' tree | commitdiff
2017-07-29 Russell SimImported Upstream version 0.26.0 tree | commitdiff
2017-06-11 Edward ThomsonMerge pull request #4088 from chescock/packfile-name... tree | commitdiff
2017-05-20 Carlos Martín NietoMerge pull request #4097 from implausible/fix/auto... tree | commitdiff
2017-04-24 Russell SimMerge tag 'upstream/0.25.1' tree | commitdiff
2017-04-24 Russell SimImported Upstream version 0.25.1 tree | commitdiff
2017-03-31 Edward ThomsonMerge remote-tracking branch 'origin/pr/3790' into... tree | commitdiff
2017-03-23 Edward ThomsonMerge branch 'pr/3957' tree | commitdiff
2017-02-13 Edward ThomsonMerge pull request #4115 from gsaralms/users/gsaral... tree | commitdiff
2017-02-10 Edward ThomsonMerge pull request #4112 from cbargren/fix/proxy-env... tree | commitdiff
2017-02-10 Edward ThomsonMerge pull request #4111 from pks-t/pks/dos-prefix tree | commitdiff
2017-02-10 Edward ThomsonMerge pull request #4117 from rcjsuen/patch-1 tree | commitdiff
2017-02-10 Edward ThomsonMerge pull request #4119 from libgit2/ethomson/submodul... tree | commitdiff
2017-02-09 Edward Thomsonmerge_trees: introduce test for submodule renames tree | commitdiff
2017-01-21 Edward ThomsonMerge pull request #4051 from tiennou/clang-analyzer-1 tree | commitdiff
2017-01-21 Edward ThomsonMerge pull request #4053 from chescock/extend-packfile... tree | commitdiff
2017-01-21 Edward ThomsonMerge branch 'pr/3912' tree | commitdiff
2017-01-21 Edward ThomsonMerge pull request #4078 from pks-t/pks/example-cleanup tree | commitdiff
2017-01-21 Edward ThomsonMerge pull request #3892 from mitesch/shared_buffer tree | commitdiff
2017-01-21 Edward ThomsonMerge branch 'master' into pr/3938 tree | commitdiff
2017-01-21 Edward ThomsonMerge branch 'pr/4060' tree | commitdiff
2017-01-14 Edward ThomsonMerge pull request #4054 from jfultz/jfultz/fix_GIT_CHE... tree | commitdiff
2017-01-14 Carlos Martín NietoMerge pull request #4061 from libgit2/ethomson/merge_opts tree | commitdiff
2017-01-01 Edward Thomsonmerge: set default rename threshold tree | commitdiff
2016-10-09 Edward ThomsonMerge branch 'pr/3809' tree | commitdiff
2016-07-24 Edward ThomsonMerge pull request #3815 from pks-t/pks/coverity-model tree | commitdiff
2016-07-01 Edward ThomsonMerge pull request #3836 from joshtriplett/cleanup... tree | commitdiff
2016-07-01 Edward ThomsonMerge pull request #3711 from joshtriplett/git_reposito... tree | commitdiff
2016-06-26 Edward ThomsonMerge pull request #3223 from ethomson/apply tree | commitdiff
2016-05-26 Edward Thomsongit_diff_generated: abstract generated diffs tree | commitdiff
2016-04-03 Andreas HenrikssonMerge tag 'upstream/0.24.0' tree | commitdiff
2016-04-03 Andreas HenrikssonImported Upstream version 0.24.0 tree | commitdiff
2016-03-31 Carlos Martín NietoMerge pull request #3575 from pmq20/master-13jan16 tree | commitdiff
2016-03-24 Carlos Martín NietoMerge pull request #3574 from chescock/buffer-sideband... tree | commitdiff
2016-03-22 Carlos Martín NietoMerge pull request #3559 from yongthecoder/master tree | commitdiff
2016-03-22 Carlos Martín NietoMerge pull request #3701 from jfultz/fix-0.24.0-changelog tree | commitdiff
2016-03-18 Edward ThomsonMerge pull request #3699 from libgit2/cmn/win32-free-tls tree | commitdiff
2016-03-18 Edward ThomsonMerge pull request #3660 from mstrap/mingw tree | commitdiff
2016-03-17 Carlos Martín NietoMerge pull request #3564 from ethomson/merge_drivers tree | commitdiff
2016-03-17 Edward Thomsonmerge drivers: handle configured but not found driver tree | commitdiff
2016-03-17 Edward Thomsonmerge driver: remove `check` callback tree | commitdiff
2016-03-17 Edward Thomsonmerge driver: tests for set and unset merge attribute tree | commitdiff
2016-03-17 Edward Thomsonmerge driver: tests for custom default merge drivers tree | commitdiff
2016-03-17 Edward Thomsonmerge driver: test GIT_EMERGECONFLICT tree | commitdiff
2016-03-17 Edward Thomsonmerge driver: test GIT_PASSTHROUGH tree | commitdiff
2016-03-17 Edward Thomsonmerge driver: introduce custom merge drivers tree | commitdiff
2016-03-17 Stan HuFix rebase bug and include test for merge=union tree | commitdiff
2016-03-11 Carlos Martín NietoMerge pull request #3636 from nerdishbynature/fix-non... tree | commitdiff
2016-03-09 Carlos Martín NietoMerge pull request #3623 from ethomson/rebase_with_commit tree | commitdiff
2016-03-08 Vicent MartiMerge pull request #3656 from ethomson/exists_prefixes tree | commitdiff
2016-03-08 Edward ThomsonMerge pull request #3555 from cbargren/ssh-git-protocols tree | commitdiff
2016-03-08 Edward ThomsonMerge pull request #3652 from libgit2/cmn/commit-to... tree | commitdiff
2016-03-08 Carlos Martín NietoMerge pull request #3655 from ethomson/nanosecond_defaults tree | commitdiff
2016-03-07 Edward Thomsonmerge::workdir::dirty: update to use `st_ctime_nsec` tree | commitdiff
2016-02-29 Edward ThomsonMerge pull request #3567 from sba1/few-p_getaddrinfo... tree | commitdiff
2016-02-28 Carlos Martín NietoMerge pull request #3644 from ethomson/debug_pool tree | commitdiff
2016-02-28 Edward ThomsonMerge pull request #3577 from rossdylan/rossdylan/pooldebug tree | commitdiff
2016-02-19 Carlos Martín NietoMerge pull request #3597 from ethomson/filter_registration tree | commitdiff
2016-02-18 Carlos Martín NietoMerge pull request #3604 from ethomson/nsec_xplat tree | commitdiff
2016-02-18 Carlos Martín NietoMerge pull request #3606 from ethomson/drop_xp tree | commitdiff
2016-02-18 Carlos Martín NietoMerge pull request #3613 from ethomson/fixups tree | commitdiff
2016-02-12 Edward Thomsonwin32: introduce p_timeval that isn't stupid tree | commitdiff
2016-02-11 Edward Thomsonmerge tests: correct casts tree | commitdiff
2015-12-01 Edward ThomsonMerge pull request #3508 from libgit2/cmn/tree-parse... tree | commitdiff
2015-11-30 Carlos Martín NietoMerge pull request #3513 from ethomson/merge_recursive tree | commitdiff
2015-11-25 Edward Thomsonrecursive merge: add a recursion limit tree | commitdiff
2015-11-25 Edward Thomsonmerge: handle conflicts in recursive base building tree | commitdiff
2015-11-25 Edward Thomsonmerge tests: add complex recursive example tree | commitdiff
2015-11-25 Edward Thomsonrecursive: test conflict output during recursive merge tree | commitdiff
2015-11-25 Edward Thomsonmerge tests: move expected data into own file tree | commitdiff
2015-11-25 Edward Thomsonmerge: add recursive test with conflicting contents tree | commitdiff
2015-11-25 Edward Thomsonmerge: add recursive test with three merge bases tree | commitdiff
2015-11-25 Edward Thomsonmerge: improve test names in recursive merge tests tree | commitdiff
2015-11-25 Edward Thomsonmerge: add a third-level recursive merge tree | commitdiff
2015-11-25 Edward Thomsonmerge: add a second-level recursive merge tree | commitdiff
2015-11-25 Edward Thomsonmerge: add simple recursive test tree | commitdiff
2015-11-25 Edward Thomsonmerge: rename `git_merge_tree_flags_t` -> `git_merge_fl... tree | commitdiff
2015-11-12 Carlos Martín NietoMerge pull request #3170 from CmdrMoozy/nsec_fix tree | commitdiff
2015-10-23 Edward ThomsonMerge pull request #3477 from linquize/inttypes.h tree | commitdiff
2015-10-23 Carlos Martín NietoMerge pull request #3483 from ethomson/cmake_xcode tree | commitdiff
2015-10-23 Carlos Martín NietoMerge pull request #3481 from ethomson/xdiff_include tree | commitdiff
2015-10-23 Vicent MartiMerge pull request #3482 from ethomson/merge_fail_on_co... tree | commitdiff
2015-10-22 Edward Thomsonmerge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT tree | commitdiff
2015-10-15 Carlos Martín NietoMerge pull request #3444 from ethomson/add_preserves_co... tree | commitdiff
2015-10-14 Edward ThomsonMerge pull request #3453 from libgit2/cmn/warn-python tree | commitdiff
next
The git library used in some Proxmox tool chains