git.proxmox.com Git - libgit2.git/history - tests/merge/merge

]> git.proxmox.com Git - libgit2.git/history - tests/merge/merge_helpers.c

[libgit2.git] / tests / merge / merge_helpers.c

2022-05-05	Mohammed Bilal	New upstream version 1.4.3+dfsg.1	blob \| commitdiff \| raw
2020-12-06	Utkarsh Gupta	New upstream version 1.1.0+dfsg.1	blob \| commitdiff \| raw \| diff to current
2019-05-11	Jongmin Kim	New upstream version 0.28.1+dfsg.1	blob \| commitdiff \| raw \| diff to current
2016-04-03	Andreas Henriksson	Imported Upstream version 0.24.0	blob \| commitdiff \| raw \| diff to current
2015-12-01	Edward Thomson	Merge pull request #3508 from libgit2/cmn/tree-parse...	blob \| commitdiff \| raw \| diff to current
2015-11-30	Carlos Martín Nieto	Merge pull request #3513 from ethomson/merge_recursive	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: add simple recursive test	blob \| commitdiff \| raw \| diff to current
2015-11-12	Carlos Martín Nieto	Merge pull request #3170 from CmdrMoozy/nsec_fix	blob \| commitdiff \| raw \| diff to current
2015-10-23	Edward Thomson	Merge pull request #3477 from linquize/inttypes.h	blob \| commitdiff \| raw \| diff to current
2015-10-23	Carlos Martín Nieto	Merge pull request #3483 from ethomson/cmake_xcode	blob \| commitdiff \| raw \| diff to current
2015-10-23	Carlos Martín Nieto	Merge pull request #3481 from ethomson/xdiff_include	blob \| commitdiff \| raw \| diff to current
2015-10-23	Vicent Marti	Merge pull request #3482 from ethomson/merge_fail_on_co...	blob \| commitdiff \| raw \| diff to current
2015-10-22	Edward Thomson	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT	blob \| commitdiff \| raw \| diff to current
2015-08-01	Carlos Martín Nieto	Merge pull request #3333 from libgit2/cmn/for-v23	blob \| commitdiff \| raw \| diff to current
2015-07-28	Matthew Plough	Fix #3094 - improve use of portable size_t/ssize_t...	blob \| commitdiff \| raw \| diff to current
2015-07-24	Edward Thomson	Merge pull request #3303 from libgit2/cmn/index-add...	blob \| commitdiff \| raw \| diff to current
2015-07-24	Edward Thomson	Merge pull request #3305 from libgit2/cmn/reflog-del...	blob \| commitdiff \| raw \| diff to current
2015-07-24	Edward Thomson	Merge pull request #3304 from libgit2/cmn/checkout...	blob \| commitdiff \| raw \| diff to current
2015-07-22	joshaber	Merge branch 'master' into fix-init-ordering	blob \| commitdiff \| raw \| diff to current
2015-07-15	Edward Thomson	Merge pull request #3311 from Fallso/MacroRedefinition	blob \| commitdiff \| raw \| diff to current
2015-07-13	Carlos Martín Nieto	Merge pull request #3302 from libgit2/cmn/submodule...	blob \| commitdiff \| raw \| diff to current
2015-07-13	Carlos Martín Nieto	Merge pull request #3306 from libgit2/cmn/fetch-ex...	blob \| commitdiff \| raw \| diff to current
2015-07-12	Carlos Martín Nieto	Merge branch 'portable-zu'	blob \| commitdiff \| raw \| diff to current
2015-07-12	Matthew Plough	Fix #3094 - improve use of portable size_t/ssize_t...	blob \| commitdiff \| raw \| diff to current
2015-03-24	Carlos Martín Nieto	Merge pull request #3010 from ethomson/checkout_invalid...	blob \| commitdiff \| raw \| diff to current
2015-03-18	Carlos Martín Nieto	Merge remote-tracking branch 'ethomson/submodule_8dot3'	blob \| commitdiff \| raw \| diff to current
2015-03-11	Carlos Martín Nieto	Merge commit 'refs/pull/2879/head' of ssh://github...	blob \| commitdiff \| raw \| diff to current
2015-03-04	Carlos Martín Nieto	Merge pull request #2932 from jeffhostetler/jeffhostetl...	blob \| commitdiff \| raw \| diff to current
2015-03-04	Carlos Martín Nieto	Merge pull request #2886 from jeffhostetler/jeffhostetl...	blob \| commitdiff \| raw \| diff to current
2015-03-03	Edward Thomson	Merge pull request #2934 from akikoskinen/mingw_build_fix	blob \| commitdiff \| raw \| diff to current
2015-03-03	Edward Thomson	Merge pull request #2913 from ethomson/stash_fixup	blob \| commitdiff \| raw \| diff to current
2015-03-03	Edward Thomson	Merge pull request #2808 from libgit2/cmn/repo-ident	blob \| commitdiff \| raw \| diff to current
2015-03-03	Carlos Martín Nieto	Remove the signature from ref-modifying functions	blob \| commitdiff \| raw \| diff to current
2014-11-18	Edward Thomson	Merge pull request #2654 from linquize/missing-obj	blob \| commitdiff \| raw \| diff to current
2014-11-09	Carlos Martín Nieto	Merge pull request #2653 from ethomson/contributing	blob \| commitdiff \| raw \| diff to current
2014-10-27	Carlos Martín Nieto	Merge commit 'refs/pull/2366/head' of github.com:libgit...	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	Merge pull request #2482 from libgit2/ed/rebase	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	s/git_merge_head/git_annotated_commit	blob \| commitdiff \| raw \| diff to current
2014-10-10	Carlos Martín Nieto	Merge pull request #2575 from cirosantilli/factor-struc...	blob \| commitdiff \| raw \| diff to current
2014-10-10	Carlos Martín Nieto	Merge pull request #2498 from linquize/read-large-file	blob \| commitdiff \| raw \| diff to current
2014-10-10	Carlos Martín Nieto	Merge pull request #2556 from sbc100/fix_warnings	blob \| commitdiff \| raw \| diff to current
2014-10-10	Carlos Martín Nieto	Merge pull request #2542 from linquize/fetch-head	blob \| commitdiff \| raw \| diff to current
2014-10-10	Carlos Martín Nieto	Merge pull request #2588 from swansontec/ssl-cert-path2	blob \| commitdiff \| raw \| diff to current
2014-10-10	Carlos Martín Nieto	Merge pull request #2499 from csware/hard-reset-checkou...	blob \| commitdiff \| raw \| diff to current
2014-10-10	Edward Thomson	Merge pull request #2574 from csware/hostname-for-certi...	blob \| commitdiff \| raw \| diff to current
2014-09-30	Carlos Martín Nieto	Merge remote-tracking branch 'upstream/master' into...	blob \| commitdiff \| raw \| diff to current
2014-09-29	Edward Thomson	Merge pull request #2581 from jacquesg/stash-ignored...	blob \| commitdiff \| raw \| diff to current
2014-09-29	Edward Thomson	Merge pull request #2584 from jacquesg/pool-alignment	blob \| commitdiff \| raw \| diff to current
2014-09-26	Jakub Čajka	Fixed merge REUC test for big-endian 64-bit	blob \| commitdiff \| raw \| diff to current
2014-06-20	Vicent Marti	libgit2 v0.21.0	blob \| commitdiff \| raw \| diff to current
2014-06-11	Carlos Martín Nieto	Merge branch 'cmn/zlib-update' into cmn/update-zlib	blob \| commitdiff \| raw \| diff to current
2014-04-01	Edward Thomson	Merge pull request #2178 from libgit2/rb/fix-short-id	blob \| commitdiff \| raw \| diff to current
2014-03-25	Edward Thomson	Merge pull request #2181 from anuraggup/hide_cb	blob \| commitdiff \| raw \| diff to current
2014-03-24	Vicent Marti	Merge pull request #2183 from ethomson/merge_refactor	blob \| commitdiff \| raw \| diff to current
2014-03-20	Edward Thomson	Remove `git_merge_result` as it's now unnecessary	blob \| commitdiff \| raw \| diff to current
2014-03-20	Edward Thomson	Update git_merge_tree_opts to git_merge_options	blob \| commitdiff \| raw \| diff to current
2014-03-20	Edward Thomson	Change signature of `git_merge` to take merge and check...	blob \| commitdiff \| raw \| diff to current
2014-03-07	Vicent Marti	Merge pull request #2028 from libgit2/options-names	blob \| commitdiff \| raw \| diff to current
2014-03-06	Ben Straub	git_checkout_opts -> git_checkout_options	blob \| commitdiff \| raw \| diff to current
2014-03-06	Vicent Marti	Merge pull request #1997 from mgbowen/merge-options...	blob \| commitdiff \| raw \| diff to current
2014-02-05	Ben Straub	Merge pull request #2027 from libgit2/rb/only-windows...	blob \| commitdiff \| raw \| diff to current
2014-01-27	Vicent Marti	Merge pull request #2066 from libgit2/rb/builtin-diff...	blob \| commitdiff \| raw \| diff to current
2014-01-27	Vicent Marti	Merge pull request #2075 from libgit2/cmn/leftover-oid	blob \| commitdiff \| raw \| diff to current
2014-01-25	Carlos Martín Nieto	index: rename an entry's id to 'id'	blob \| commitdiff \| raw \| diff to current
2014-01-18	Edward Thomson	Merge pull request #2059 from linquize/git_config_get_crash	blob \| commitdiff \| raw \| diff to current
2014-01-16	Ben Straub	Merge pull request #2044 from libgit2/coverity	blob \| commitdiff \| raw \| diff to current
2014-01-15	Vicent Marti	Merge pull request #2050 from libgit2/cmn/always-reflog...	blob \| commitdiff \| raw \| diff to current
2014-01-15	Carlos Martín Nieto	refs: remove the _with_log differentiation	blob \| commitdiff \| raw \| diff to current
2013-12-18	Vicent Marti	Merge pull request #1920 from libgit2/cmn/ref-with-log	blob \| commitdiff \| raw \| diff to current
2013-12-11	Russell Belfer	Merge pull request #1985 from libgit2/diff-rename-config	blob \| commitdiff \| raw \| diff to current
2013-12-09	Vicent Marti	Merge pull request #1996 from ethomson/warnings	blob \| commitdiff \| raw \| diff to current
2013-12-09	Edward Thomson	Clean up warnings	blob \| commitdiff \| raw \| diff to current
2013-12-03	Vicent Martí	Merge pull request #1983 from ethomson/revert	blob \| commitdiff \| raw \| diff to current
2013-12-03	Edward Thomson	Bare naked merge and rebase	blob \| commitdiff \| raw \| diff to current
2013-11-20	Vicent Marti	Merge branch 'development'	blob \| commitdiff \| raw \| diff to current
2013-11-14	Vicent Martí	Merge pull request #1962 from libgit2/rename-tests	blob \| commitdiff \| raw \| diff to current
2013-11-14	Ben Straub	Rename tests-clar to tests	blob \| commitdiff \| raw \| diff to current

The git library used in some Proxmox tool chains

RSS Atom