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

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

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

2020-12-06	Utkarsh Gupta	New upstream version 1.1.0+dfsg.1	blob \| commitdiff \| raw
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 tests: move expected data into own file	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-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 #2499 from csware/hard-reset-checkou...	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 #2559 from libgit2/cmn/free-tls...	blob \| commitdiff \| raw \| diff to current
2014-09-25	Carlos Martín Nieto	Merge pull request #2570 from cirosantilli/rm-unused-var	blob \| commitdiff \| raw \| diff to current
2014-09-17	Vicent Marti	Merge pull request #2567 from cirosantilli/factor-41	blob \| commitdiff \| raw \| diff to current
2014-09-16	Ciro Santilli	Factor 40 and 41 constants from source.	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-20	Edward Thomson	Introduce git_merge_file for consumers	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-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