git.proxmox.com Git - libgit2.git/history - tests/merge/workdir/simple.c

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

[libgit2.git] / tests / merge / workdir / simple.c

2019-05-11	Jongmin Kim	New upstream version 0.28.1+dfsg.1	blob \| commitdiff \| raw
2017-04-24	Russell Sim	Imported Upstream version 0.25.1	blob \| commitdiff \| raw \| diff to current
2016-04-03	Andreas Henriksson	Imported Upstream version 0.24.0	blob \| commitdiff \| raw \| diff to current
2016-03-31	Carlos Martín Nieto	Merge pull request #3575 from pmq20/master-13jan16	blob \| commitdiff \| raw \| diff to current
2016-03-24	Carlos Martín Nieto	Merge pull request #3574 from chescock/buffer-sideband...	blob \| commitdiff \| raw \| diff to current
2016-03-22	Carlos Martín Nieto	Merge pull request #3559 from yongthecoder/master	blob \| commitdiff \| raw \| diff to current
2016-03-22	Carlos Martín Nieto	Merge pull request #3701 from jfultz/fix-0.24.0-changelog	blob \| commitdiff \| raw \| diff to current
2016-03-18	Edward Thomson	Merge pull request #3699 from libgit2/cmn/win32-free-tls	blob \| commitdiff \| raw \| diff to current
2016-03-18	Edward Thomson	Merge pull request #3660 from mstrap/mingw	blob \| commitdiff \| raw \| diff to current
2016-03-17	Carlos Martín Nieto	Merge pull request #3564 from ethomson/merge_drivers	blob \| commitdiff \| raw \| diff to current
2016-03-17	Stan Hu	Fix rebase bug and include test for merge=union	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
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	reset: remove reflog message override	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-12-22	Edward Thomson	Merge pull request #2745 from libgit2/cmn/pkg-config-ssh	blob \| commitdiff \| raw \| diff to current
2014-12-10	Edward Thomson	Merge pull request #2678 from libgit2/cmn/io-stream	blob \| commitdiff \| raw \| diff to current
2014-12-09	Edward Thomson	Merge pull request #2750 from linquize/generate.py	blob \| commitdiff \| raw \| diff to current
2014-12-08	Edward Thomson	Merge pull request #2751 from linquize/broken-test-win	blob \| commitdiff \| raw \| diff to current
2014-12-07	Linquize	Fix broken merge tests due to autocrlf was not false	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	Edward Thomson	Merge pull request #2593 from libgit2/cmn/remote-delete...	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 #2600 from libgit2/cmn/embed-ssh	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-08-03	Sven Strickroth	Allow to propagate checkout callbacks to git HARD reset	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-05-12	Russell Belfer	Merge pull request #2188 from libgit2/cmn/config-snapshot	blob \| commitdiff \| raw \| diff to current
2014-04-25	Vicent Marti	Merge pull request #2284 from jacquesg/push-progress...	blob \| commitdiff \| raw \| diff to current
2014-04-25	Vicent Marti	Merge pull request #2297 from libgit2/rb/status-with...	blob \| commitdiff \| raw \| diff to current
2014-04-25	Vicent Marti	Merge pull request #2241 from libgit2/rb/stash-skip...	blob \| commitdiff \| raw \| diff to current
2014-04-24	Russell Belfer	Merge pull request #2294 from ethomson/merge_checkout_s...	blob \| commitdiff \| raw \| diff to current
2014-04-23	Edward Thomson	merge: checkout default shouldn't clobber given	blob \| commitdiff \| raw \| diff to current
2014-04-18	Russell Belfer	Merge pull request #2213 from ethomson/safecrlf	blob \| commitdiff \| raw \| diff to current
2014-04-16	Vicent Marti	Merge pull request #2261 from jacquesg/format-patch	blob \| commitdiff \| raw \| diff to current
2014-04-16	Vicent Marti	Merge pull request #2269 from libgit2/rb/fix-leading...	blob \| commitdiff \| raw \| diff to current
2014-04-15	Vicent Marti	Merge pull request #2235 from jacquesg/cherry-pick	blob \| commitdiff \| raw \| diff to current
2014-04-14	Jacques Germishuys	Capture conflict information in MERGE_MSG for revert...	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
2014-03-06	Vicent Marti	Merge pull request #1997 from mgbowen/merge-options...	blob \| commitdiff \| raw \| diff to current
2014-03-02	Ben Straub	Merge pull request #2144 from linquize/branch-f-current	blob \| commitdiff \| raw \| diff to current
2014-02-08	Russell Belfer	Merge pull request #2099 from libgit2/bs/more-reflog...	blob \| commitdiff \| raw \| diff to current
2014-02-05	Ben Straub	Prevent user's merge.conflictstyle from breaking tests	blob \| commitdiff \| raw \| diff to current
2014-02-05	Ben Straub	Merge remote-tracking branch 'libgit2/development'...	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-02-03	Ben Straub	Add reflog parameters to git_reset	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-26	Edward Thomson	Merge pull request #2057 from GrahamDennis/local-file...	blob \| commitdiff \| raw \| diff to current
2014-01-25	Carlos Martín Nieto	merge: rename _oid() -> id()	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-23	Vicent Marti	Merge pull request #2074 from linquize/pack-filename...	blob \| commitdiff \| raw \| diff to current
2014-01-21	Vicent Marti	Merge pull request #2061 from ethomson/merge_improvements	blob \| commitdiff \| raw \| diff to current
2014-01-20	Edward Thomson	Support union merges	blob \| commitdiff \| raw \| diff to current
2014-01-20	Edward Thomson	Load merge.conflictstyle setting from config	blob \| commitdiff \| raw \| diff to current
2014-01-20	Edward Thomson	Introduce diff3 mode for checking out conflicts	blob \| commitdiff \| raw \| diff to current
2014-01-20	Edward Thomson	Don't try to merge binary files	blob \| commitdiff \| raw \| diff to current
2014-01-20	Edward Thomson	merge_file should use more aggressive levels	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-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