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

]> git.proxmox.com Git - libgit2.git/history - src/merge_file.c

2019-05-11	Jongmin Kim	New upstream version 0.28.1+dfsg.1	blob \| commitdiff \| raw
2018-04-26	Pirate Praveen	New upstream version 0.27.0+dfsg.1	blob \| commitdiff \| raw \| diff to current
2017-07-29	Russell Sim	Imported Upstream version 0.26.0	blob \| commitdiff \| raw \| diff to current
2017-04-24	Russell Sim	Imported Upstream version 0.25.1	blob \| commitdiff \| raw \| diff to current
2017-03-31	Edward Thomson	Merge remote-tracking branch 'origin/pr/3790' into...	blob \| commitdiff \| raw \| diff to current
2017-03-23	Edward Thomson	Merge branch 'pr/3957'	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge pull request #4053 from chescock/extend-packfile...	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge branch 'pr/3912'	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge pull request #4078 from pks-t/pks/example-cleanup	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge pull request #3892 from mitesch/shared_buffer	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge branch 'master' into pr/3938	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge branch 'pr/4060'	blob \| commitdiff \| raw \| diff to current
2017-01-14	Edward Thomson	Merge pull request #4054 from jfultz/jfultz/fix_GIT_CHE...	blob \| commitdiff \| raw \| diff to current
2017-01-14	Carlos Martín Nieto	Merge pull request #4061 from libgit2/ethomson/merge_opts	blob \| commitdiff \| raw \| diff to current
2017-01-13	Carlos Martín Nieto	Merge pull request #4049 from libgit2/ethomson/error_msgs	blob \| commitdiff \| raw \| diff to current
2016-12-29	Edward Thomson	giterr_set: consistent error messages	blob \| commitdiff \| raw \| diff to current
2016-05-09	Edward Thomson	Merge pull request #3767 from pks-t/pks/misc-fixes	blob \| commitdiff \| raw \| diff to current
2016-05-02	Patrick Steinhardt	merge_file: do not unnecessarily check ours/theirs...	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	Edward Thomson	merge driver: introduce custom merge drivers	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-15	Carlos Martín Nieto	Merge pull request #3444 from ethomson/add_preserves_co...	blob \| commitdiff \| raw \| diff to current
2015-10-14	Edward Thomson	Merge pull request #3453 from libgit2/cmn/warn-python	blob \| commitdiff \| raw \| diff to current
2015-10-05	Edward Thomson	Merge pull request #3451 from ethomson/xdiff	blob \| commitdiff \| raw \| diff to current
2015-10-05	Edward Thomson	diff: don't feed large files to xdiff	blob \| commitdiff \| raw \| diff to current
2015-10-05	Edward Thomson	merge_file: treat large files as binary	blob \| commitdiff \| raw \| diff to current
2015-04-24	Edward Thomson	Merge pull request #3071 from linquize/git_reflog_drop	blob \| commitdiff \| raw \| diff to current
2015-04-17	Edward Thomson	Merge pull request #2999 from pks-t/submodule-set-url	blob \| commitdiff \| raw \| diff to current
2015-04-10	Edward Thomson	Merge pull request #2974 from libgit2/cmn/clone-everything	blob \| commitdiff \| raw \| diff to current
2015-04-10	Edward Thomson	Merge pull request #3030 from linquize/symlink_supported	blob \| commitdiff \| raw \| diff to current
2015-03-24	Edward Thomson	Merge pull request #2990 from leoyanggit/custom_param	blob \| commitdiff \| raw \| diff to current
2015-03-24	Edward Thomson	Merge pull request #2986 from tkelman/mingw_winhttp	blob \| commitdiff \| raw \| diff to current
2015-03-24	Edward Thomson	Merge pull request #2947 from libgit2/cmn/notes-buf	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-19	Carlos Martín Nieto	Merge pull request #2996 from ethomson/dll_comments	blob \| commitdiff \| raw \| diff to current
2015-03-18	Edward Thomson	Merge pull request #2967 from jacquesg/merge-whitespace	blob \| commitdiff \| raw \| diff to current
2015-03-16	Jacques Germishuys	Added options to enable patience and minimal diff drivers	blob \| commitdiff \| raw \| diff to current
2015-03-16	Jacques Germishuys	Collapse whitespace flags into git_merge_file_flags_t	blob \| commitdiff \| raw \| diff to current
2015-03-16	Jacques Germishuys	Allow for merges with whitespace discrepancies	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-04	Vicent Marti	Merge pull request #2211 from Yogu/retry-renaming-config	blob \| commitdiff \| raw \| diff to current
2014-04-02	Vicent Marti	Merge pull request #2230 from anuraggup/revwalk-merge...	blob \| commitdiff \| raw \| diff to current
2014-04-01	Russell Belfer	Merge pull request #2208 from libgit2/vmg/mempack	blob \| commitdiff \| raw \| diff to current
2014-04-01	Edward Thomson	Merge pull request #2226 from libgit2/rb/submodule...	blob \| commitdiff \| raw \| diff to current
2014-04-01	Vicent Marti	Merge pull request #2206 from libgit2/cmn/inmemory...	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-31	Russell Belfer	Cleanups	blob \| commitdiff \| raw \| diff to current
2014-03-31	Vicent Marti	Merge pull request #2224 from ethomson/merge_file_const	blob \| commitdiff \| raw \| diff to current
2014-03-31	Edward Thomson	Const up members of git_merge_file_result	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	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-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-26	Edward Thomson	Merge pull request #2057 from GrahamDennis/local-file...	blob \| commitdiff \| raw \| diff to current
2014-01-25	Carlos Martín Nieto	diff: rename the file's 'oid' to '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	Introduce diff3 mode for checking out conflicts	blob \| commitdiff \| raw \| diff to current
2014-01-20	Edward Thomson	merge_file should use more aggressive levels	blob \| commitdiff \| raw \| diff to current
2013-11-20	Vicent Marti	Merge branch 'development'	blob \| commitdiff \| raw \| diff to current
2013-10-28	Ben Straub	Merge remote-tracking branch 'libgit2/development'...	blob \| commitdiff \| raw \| diff to current
2013-10-28	Vicent Martí	Merge pull request #1891 from libgit2/cmn/fix-thin...	blob \| commitdiff \| raw \| diff to current
2013-10-28	Ben Straub	Merge pull request #1802 from libgit2/cmn/reflog-backend	blob \| commitdiff \| raw \| diff to current
2013-10-22	Vicent Martí	Merge pull request #1897 from libgit2/split-patch-from...	blob \| commitdiff \| raw \| diff to current
2013-10-16	Vicent Martí	Merge pull request #1702 from ethomson/checkout_merge	blob \| commitdiff \| raw \| diff to current
2013-10-16	Edward Thomson	checkout (from index) can write conflicts	blob \| commitdiff \| raw \| diff to current
2013-08-09	Russell Belfer	Merge pull request #1462 from yorah/fix/libgit2sharp...	blob \| commitdiff \| raw \| diff to current
2013-06-24	Vicent Marti	Merge branch 'development'	blob \| commitdiff \| raw \| diff to current
2013-05-31	Vicent Martí	Merge pull request #1559 from carlosmn/ref-shorthand	blob \| commitdiff \| raw \| diff to current
2013-05-16	Vicent Martí	Merge pull request #1558 from bmorganpa/ssh_transport	blob \| commitdiff \| raw \| diff to current
2013-05-16	Vicent Martí	Merge pull request #1586 from jamill/fetch_fix	blob \| commitdiff \| raw \| diff to current
2013-05-15	Vicent Martí	Merge pull request #1588 from arrbee/fixes-for-checkout...	blob \| commitdiff \| raw \| diff to current
2013-05-15	Vicent Martí	Merge pull request #1578 from nulltoken/fix/whitespaces	blob \| commitdiff \| raw \| diff to current
2013-05-15	nulltoken	Fix trailing whitespaces	blob \| commitdiff \| raw \| diff to current
2013-05-07	Brad Morgan	Merge remote-tracking branch 'origin/development' into...	blob \| commitdiff \| raw \| diff to current
2013-05-06	Vicent Martí	Merge pull request #1526 from arrbee/cleanup-error...	blob \| commitdiff \| raw \| diff to current
2013-05-01	Vicent Martí	Merge pull request #1389 from ethomson/merge_trees	blob \| commitdiff \| raw \| diff to current
2013-04-30	Edward Thomson	merge!	blob \| commitdiff \| raw \| diff to current

The git library used in some Proxmox tool chains

RSS Atom