]> git.proxmox.com Git - libgit2.git/history - tests/merge
projects / libgit2.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
transports: smart: fix memory leak on OOM path
[libgit2.git] / tests / merge /
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
2015-10-05 Edward ThomsonMerge pull request #3451 from ethomson/xdiff tree | commitdiff
2015-10-05 Edward Thomsondiff: don't feed large files to xdiff tree | commitdiff
2015-10-05 Edward Thomsonmerge_file: treat large files as binary tree | commitdiff
2015-10-02 Axel RasmussenMerge branch 'master' into nsec_fix_next tree | commitdiff
2015-09-30 Carlos Martín NietoMerge pull request #3446 from ethomson/portability tree | commitdiff
2015-09-19 Axel Rasmussencmake: Only provide USE_NSEC if struct stat members... tree | commitdiff
2015-09-19 Axel Rasmussencmake: add USE_NSEC, and only check nanosec m/ctime... tree | commitdiff
2015-09-13 Carlos Martín NietoMerge branch 'cmn/ignore-dir-check' tree | commitdiff
2015-09-09 Carlos Martín NietoMerge pull request #3379 from theseion/additional_libss... tree | commitdiff
2015-09-06 Edward ThomsonMerge pull request #3366 from libgit2/cmn/index-hashmap tree | commitdiff
2015-09-01 Carlos Martín NietoMerge pull request #3402 from ethomson/faster_diff tree | commitdiff
2015-08-28 Edward Thomsoniterator: use an options struct instead of args tree | commitdiff
2015-07-24 Edward ThomsonMerge pull request #3303 from libgit2/cmn/index-add... tree | commitdiff
2015-07-24 Edward ThomsonMerge pull request #3305 from libgit2/cmn/reflog-del... tree | commitdiff
2015-07-24 Edward ThomsonMerge pull request #3304 from libgit2/cmn/checkout... tree | commitdiff
2015-07-22 joshaberMerge branch 'master' into fix-init-ordering tree | commitdiff
2015-07-15 Edward ThomsonMerge pull request #3311 from Fallso/MacroRedefinition tree | commitdiff
2015-07-13 Carlos Martín NietoMerge pull request #3302 from libgit2/cmn/submodule... tree | commitdiff
2015-07-13 Carlos Martín NietoMerge pull request #3306 from libgit2/cmn/fetch-ex... tree | commitdiff
2015-07-12 Carlos Martín NietoMerge branch 'portable-zu' tree | commitdiff
2015-07-12 Matthew PloughFix #3094 - improve use of portable size_t/ssize_t... tree | commitdiff
2015-07-11 Edward ThomsonMerge pull request #3292 from tkelman/patch-1 tree | commitdiff
2015-07-10 Carlos Martín NietoMerge pull request #3297 from tkelman/patch-2 tree | commitdiff
2015-07-09 Carlos Martín NietoMerge pull request #3281 from ethomson/wildcard_filters tree | commitdiff
2015-07-08 Carlos Martín NietoMerge pull request #3299 from ethomson/xdiff_update tree | commitdiff
2015-07-07 Edward Thomsonmerge_files: don't add trailing newlines tree | commitdiff
2015-06-25 Edward ThomsonMerge pull request #3256 from libgit2/cmn/fetch-spec... tree | commitdiff
2015-06-24 Carlos Martín NietoMerge pull request #3097 from libgit2/cmn/submodule... tree | commitdiff
2015-06-24 Carlos Martín NietoMerge pull request #3250 from ethomson/stash tree | commitdiff
2015-06-24 Edward ThomsonMerge pull request #3222 from git-up/conflicted tree | commitdiff
2015-06-24 Edward ThomsonMerge pull request #3131 from urkud/const-char tree | commitdiff
2015-06-24 Edward ThomsonMerge pull request #3226 from libgit2/cmn/racy-diff... tree | commitdiff
2015-06-22 Carlos Martín Nietomerge: work around write-side racy protection when... tree | commitdiff
2015-06-17 Carlos Martín NietoMerge pull request #3219 from libgit2/cmn/racy-diff tree | commitdiff
2015-06-16 Edward Thomsonmerge::workdir::dirty: tick idx to defeat racy-git tree | commitdiff
2015-06-11 Carlos Martín NietoMerge pull request #3155 from mgorny/userpass-const tree | commitdiff
2015-06-08 Carlos Martín NietoMerge pull request #3165 from ethomson/downcase tree | commitdiff
2015-05-31 Carlos Martín NietoMerge pull request #3152 from tkelman/patch-1 tree | commitdiff
2015-05-29 Carlos Martín NietoMerge pull request #3157 from mgorny/ssh_memory_auth tree | commitdiff
2015-05-28 Carlos Martín NietoMerge pull request #3139 from ethomson/diff_conflicts tree | commitdiff
2015-05-28 Edward Thomsonintroduce `git_index_entry_is_conflict` tree | commitdiff
2015-05-22 Edward ThomsonMerge pull request #3108 from libgit2/cmn/ssl-no-want tree | commitdiff
2015-05-12 Carlos Martín NietoMerge pull request #3111 from whoisj/centralizing-buffe... tree | commitdiff
2015-05-12 Carlos Martín NietoMerge pull request #3018 from ethomson/stash_apply tree | commitdiff
2015-05-11 Edward Thomsonmerge: merge iterators tree | commitdiff
2015-04-24 Edward ThomsonMerge pull request #3071 from linquize/git_reflog_drop tree | commitdiff
2015-04-17 Edward ThomsonMerge pull request #2999 from pks-t/submodule-set-url tree | commitdiff
2015-04-10 Edward ThomsonMerge pull request #2974 from libgit2/cmn/clone-everything tree | commitdiff
2015-04-10 Edward ThomsonMerge pull request #3030 from linquize/symlink_supported tree | commitdiff
2015-03-24 Edward ThomsonMerge pull request #2990 from leoyanggit/custom_param tree | commitdiff
2015-03-24 Edward ThomsonMerge pull request #2986 from tkelman/mingw_winhttp tree | commitdiff
2015-03-24 Edward ThomsonMerge pull request #2947 from libgit2/cmn/notes-buf tree | commitdiff
2015-03-24 Carlos Martín NietoMerge pull request #3010 from ethomson/checkout_invalid... tree | commitdiff
2015-03-19 Carlos Martín NietoMerge pull request #2996 from ethomson/dll_comments tree | commitdiff
2015-03-18 Edward ThomsonMerge pull request #2967 from jacquesg/merge-whitespace tree | commitdiff
2015-03-18 Carlos Martín NietoMerge remote-tracking branch 'ethomson/submodule_8dot3' tree | commitdiff
2015-03-16 Jacques GermishuysCollapse whitespace flags into git_merge_file_flags_t tree | commitdiff
2015-03-16 Jacques GermishuysRenamed git_merge_options 'flags' to 'tree_flags' tree | commitdiff
2015-03-16 Jacques GermishuysAdded tests to merge files and branches with whitespace... tree | commitdiff
2015-03-11 Carlos Martín NietoMerge commit 'refs/pull/2879/head' of ssh://github... tree | commitdiff
2015-03-04 Carlos Martín NietoMerge pull request #2932 from jeffhostetler/jeffhostetl... tree | commitdiff
2015-03-04 Carlos Martín NietoMerge pull request #2886 from jeffhostetler/jeffhostetl... tree | commitdiff
2015-03-03 Edward ThomsonMerge pull request #2934 from akikoskinen/mingw_build_fix tree | commitdiff
2015-03-03 Edward ThomsonMerge pull request #2913 from ethomson/stash_fixup tree | commitdiff
2015-03-03 Edward ThomsonMerge pull request #2808 from libgit2/cmn/repo-ident tree | commitdiff
2015-03-03 Carlos Martín Nietoreset: remove reflog message override tree | commitdiff
2015-03-03 Carlos Martín NietoRemove the signature from ref-modifying functions tree | commitdiff
2015-03-03 Carlos Martín NietoMerge pull request #2885 from JIghtuse/master tree | commitdiff
2015-02-20 Carlos Martín NietoMerge pull request #2907 from jasonhaslam/git_packfile_... tree | commitdiff
2015-02-19 Carlos Martín NietoMerge pull request #2820 from leoyanggit/mac_build tree | commitdiff
2015-02-15 Carlos Martín NietoMerge pull request #2831 from ethomson/merge_lock tree | commitdiff
2015-02-14 Edward Thomsonmerge: lock the index at the start of the merge tree | commitdiff
2015-02-13 Edward Thomsonmerge test: test an actual failure, not conflict tree | commitdiff
next
The git library used in some Proxmox tool chains