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

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

2022-05-05	Mohammed Bilal	New upstream version 1.4.3+dfsg.1	blob \| commitdiff \| raw
2021-12-10	Pirate Praveen	New upstream version 1.3.0+dfsg.1	blob \| commitdiff \| raw \| diff to current
2020-12-06	Utkarsh Gupta	New upstream version 1.1.0+dfsg.1	blob \| commitdiff \| raw \| diff to current
2018-04-26	Pirate Praveen	New upstream version 0.27.0+dfsg.1	blob \| commitdiff \| raw \| diff to current
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	Edward Thomson	merge driver: remove `check` callback	blob \| commitdiff \| raw \| diff to current
2016-03-17	Edward Thomson	merge driver: correct global initialization	blob \| commitdiff \| raw \| diff to current
2016-03-17	Edward Thomson	merge driver: allow custom default driver	blob \| commitdiff \| raw \| diff to current
2016-03-17	Edward Thomson	merge driver: introduce custom merge drivers	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: rename `git_merge_tree_flags_t` -> `git_merge_fl...	blob \| commitdiff \| raw \| diff to current
2015-05-22	Edward Thomson	Merge pull request #3108 from libgit2/cmn/ssl-no-want	blob \| commitdiff \| raw \| diff to current
2015-05-12	Carlos Martín Nieto	Merge pull request #3111 from whoisj/centralizing-buffe...	blob \| commitdiff \| raw \| diff to current
2015-05-12	Carlos Martín Nieto	Merge pull request #3018 from ethomson/stash_apply	blob \| commitdiff \| raw \| diff to current
2015-05-11	Edward Thomson	merge: merge iterators	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-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-18	Edward Thomson	Merge pull request #2967 from jacquesg/merge-whitespace	blob \| commitdiff \| raw \| diff to current
2015-03-18	Carlos Martín Nieto	Merge pull request #2993 from ethomson/clar_update	blob \| commitdiff \| raw \| diff to current
2015-03-18	Carlos Martín Nieto	Merge pull request #2955 from git-up/update_tips_fixes	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-18	Edward Thomson	Merge pull request #2985 from claudiuolteanu/patch-1	blob \| commitdiff \| raw \| diff to current
2015-03-18	Edward Thomson	Merge pull request #2983 from jeffhostetler/jeffhostetl...	blob \| commitdiff \| raw \| diff to current
2015-03-16	Jeff Hostetler	PERF: In MERGE, lazily compute is_binary	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-09-30	Carlos Martín Nieto	Merge remote-tracking branch 'upstream/master' into...	blob \| commitdiff \| raw \| diff to current
2014-08-27	Carlos Martín Nieto	Merge remote-tracking branch 'upstream/master' into...	blob \| commitdiff \| raw \| diff to current
2014-07-22	Alan Rogers	Merge remote-tracking branch 'origin/master' into fix...	blob \| commitdiff \| raw \| diff to current
2014-07-04	Vicent Marti	Merge remote-tracking branch 'origin/cmn/update-zlib'	blob \| commitdiff \| raw \| diff to current
2014-07-03	Vicent Marti	Merge pull request #2460 from libgit2/cmn/sched-yield	blob \| commitdiff \| raw \| diff to current
2014-07-03	Vicent Marti	Merge pull request #2459 from libgit2/cmn/http-url...	blob \| commitdiff \| raw \| diff to current
2014-07-02	Vicent Marti	Merge pull request #2449 from libgit2/cmn/maint-21	blob \| commitdiff \| raw \| diff to current
2014-07-02	Vicent Marti	Merge pull request #2455 from ethomson/equal_oid	blob \| commitdiff \| raw \| diff to current
2014-07-02	Vicent Marti	Merge pull request #2453 from ethomson/checkout_index	blob \| commitdiff \| raw \| diff to current
2014-07-01	Edward Thomson	git_checkout_index: checkout other indexes	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-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	Introduce git_merge__extract_conflict_paths	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	Remove fastforward / uptodate from `git_merge`	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-26	Edward Thomson	Merge pull request #2057 from GrahamDennis/local-file...	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	Don't try to merge binary files	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 #1981 from jamill/download_cancel_tweaks	blob \| commitdiff \| raw \| diff to current
2013-12-03	Vicent Martí	Merge pull request #1977 from ethomson/revert	blob \| commitdiff \| raw \| diff to current
2013-12-02	Edward Thomson	Introduce git_revert to revert a single commit	blob \| commitdiff \| raw \| diff to current
2013-11-20	Vicent Marti	Merge branch 'development'	blob \| commitdiff \| raw \| diff to current
2013-11-11	Vicent Martí	Merge pull request #1956 from libgit2/cmn/fetch-default...	blob \| commitdiff \| raw \| diff to current
2013-11-10	Vicent Martí	Merge pull request #1950 from csware/quote-config-values	blob \| commitdiff \| raw \| diff to current
2013-11-10	Vicent Martí	Merge pull request #1936 from libgit2/better-url-parsing	blob \| commitdiff \| raw \| diff to current
2013-11-05	Vicent Martí	Merge pull request #1007 from ethomson/merge	blob \| commitdiff \| raw \| diff to current
2013-11-05	Edward Thomson	merge branch into current, updating workdir	blob \| commitdiff \| raw \| diff to current
2013-11-05	Vicent Martí	Merge pull request #1941 from libgit2/rb/preserve-itera...	blob \| commitdiff \| raw \| diff to current
2013-11-05	Edward Thomson	Merge pull request #1940 from ethomson/filebuf_umask	blob \| commitdiff \| raw \| diff to current
2013-11-05	Edward Thomson	move mode_t to filebuf_open instead of _commit	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-24	Vicent Martí	Merge pull request #1593 from ethomson/conflict_iterator	blob \| commitdiff \| raw \| diff to current
2013-05-24	Vicent Martí	Merge pull request #1592 from ethomson/merge_setup	blob \| commitdiff \| raw \| diff to current
2013-05-17	Edward Thomson	merge setup	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-15	Vicent Martí	Merge pull request #1583 from linquize/whitespace	blob \| commitdiff \| raw \| diff to current
2013-05-15	Linquize	Unify whitespaces to tabs	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
next

The git library used in some Proxmox tool chains

RSS Atom