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

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

2020-10-09	Utkarsh Gupta	New upstream version 1.0.1+dfsg.1	blob \| commitdiff \| raw
2020-03-13	Utkarsh Gupta	New upstream version 0.99.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
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-06-11	Edward Thomson	Merge pull request #4088 from chescock/packfile-name...	blob \| commitdiff \| raw \| diff to current
2017-05-20	Carlos Martín Nieto	Merge pull request #4097 from implausible/fix/auto...	blob \| commitdiff \| raw \| diff to current
2017-05-20	Carlos Martín Nieto	Merge pull request #4174 from libgit2/ethomson/set_head...	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-24	Patrick Steinhardt	Merge pull request #4175 from libgit2/ethomson/dont_tru...	blob \| commitdiff \| raw \| diff to current
2017-03-23	Carlos Martín Nieto	Merge pull request #4178 from libgit2/ethomson/enfasten...	blob \| commitdiff \| raw \| diff to current
2017-03-23	Edward Thomson	Merge branch 'pr/3957'	blob \| commitdiff \| raw \| diff to current
2017-03-23	Edward Thomson	merge: indentation fixup	blob \| commitdiff \| raw \| diff to current
2017-02-13	Edward Thomson	Merge pull request #4115 from gsaralms/users/gsaral...	blob \| commitdiff \| raw \| diff to current
2017-02-13	Edward Thomson	Merge pull request #3436 from pks-t/libgit2-worktree	blob \| commitdiff \| raw \| diff to current
2017-02-13	Patrick Steinhardt	repository: rename `path_repository` and `path_gitlink`	blob \| commitdiff \| raw \| diff to current
2017-02-10	Edward Thomson	Merge pull request #4112 from cbargren/fix/proxy-env...	blob \| commitdiff \| raw \| diff to current
2017-02-10	Edward Thomson	Merge pull request #4111 from pks-t/pks/dos-prefix	blob \| commitdiff \| raw \| diff to current
2017-02-10	Edward Thomson	Merge pull request #4117 from rcjsuen/patch-1	blob \| commitdiff \| raw \| diff to current
2017-02-10	Edward Thomson	Merge pull request #4119 from libgit2/ethomson/submodul...	blob \| commitdiff \| raw \| diff to current
2017-02-09	Edward Thomson	merge: don't do rename detection on submodules	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge pull request #4051 from tiennou/clang-analyzer-1	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
2017-01-01	Edward Thomson	merge: set default rename threshold	blob \| commitdiff \| raw \| diff to current
2016-12-29	Edward Thomson	giterr_set: consistent error messages	blob \| commitdiff \| raw \| diff to current
2016-12-20	Carlos Martín Nieto	Merge pull request #3980 from tiennou/doc-fixes	blob \| commitdiff \| raw \| diff to current
2016-11-15	Carlos Martín Nieto	Merge pull request #3996 from pks-t/pks/curl-lastsocket...	blob \| commitdiff \| raw \| diff to current
2016-11-15	Carlos Martín Nieto	Merge pull request #3962 from libgit2/ethomson/issue_te...	blob \| commitdiff \| raw \| diff to current
2016-11-14	Carlos Martín Nieto	Merge pull request #4002 from pks-t/pks/giterr-format	blob \| commitdiff \| raw \| diff to current
2016-11-14	Patrick Steinhardt	common: use PRIuZ for size_t in `giterr_set` calls	blob \| commitdiff \| raw \| diff to current
2016-10-27	Russell Sim	Imported Upstream version 0.24.2	blob \| commitdiff \| raw \| diff to current
2016-10-18	Arthur Schreiber	Perf: Don't perform merge operations for trivial merges.	blob \| commitdiff \| raw \| diff to current
2016-10-09	Edward Thomson	Merge branch 'pr/3809'	blob \| commitdiff \| raw \| diff to current
2016-10-02	Edward Thomson	Merge pull request #3948 from libgit2/cmn/v24-updates	blob \| commitdiff \| raw \| diff to current
2016-10-01	Jason Haslam	Ignore submodules when checking for merge conflicts...	blob \| commitdiff \| raw \| diff to current
2016-07-24	Edward Thomson	Merge pull request #3815 from pks-t/pks/coverity-model	blob \| commitdiff \| raw \| diff to current
2016-07-01	Edward Thomson	Merge pull request #3836 from joshtriplett/cleanup...	blob \| commitdiff \| raw \| diff to current
2016-07-01	Edward Thomson	Merge pull request #3711 from joshtriplett/git_reposito...	blob \| commitdiff \| raw \| diff to current
2016-06-26	Edward Thomson	Merge pull request #3223 from ethomson/apply	blob \| commitdiff \| raw \| diff to current
2016-06-01	Edward Thomson	Merge pull request #3796 from mmuman/haiku	blob \| commitdiff \| raw \| diff to current
2016-05-26	Edward Thomson	git_diff_generated: abstract generated diffs	blob \| commitdiff \| raw \| diff to current
2016-05-26	Edward Thomson	Merge pull request #3799 from sschuberth/master	blob \| commitdiff \| raw \| diff to current
2016-05-26	Edward Thomson	Merge pull request #3798 from mmuman/stat-test-fix	blob \| commitdiff \| raw \| diff to current
2016-05-26	Edward Thomson	Merge branch 'checkout_submodules'	blob \| commitdiff \| raw \| diff to current
2016-05-26	Jason Haslam	Ignore submodules when checking for merge conflicts...	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 drivers: handle configured but not found driver	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: get a pointer to favor	blob \| commitdiff \| raw \| diff to current
2016-03-17	Edward Thomson	merge driver: correct indentation	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
2016-03-17	Stan Hu	Fix rebase bug and include test for merge=union	blob \| commitdiff \| raw \| diff to current
2016-03-17	Stan Hu	Support union merges via .gitattributes file	blob \| commitdiff \| raw \| diff to current
2016-03-08	Edward Thomson	Merge pull request #3555 from cbargren/ssh-git-protocols	blob \| commitdiff \| raw \| diff to current
2016-02-29	Edward Thomson	Merge pull request #3567 from sba1/few-p_getaddrinfo...	blob \| commitdiff \| raw \| diff to current
2016-02-28	Carlos Martín Nieto	Merge pull request #3644 from ethomson/debug_pool	blob \| commitdiff \| raw \| diff to current
2016-02-28	Edward Thomson	Merge pull request #3577 from rossdylan/rossdylan/pooldebug	blob \| commitdiff \| raw \| diff to current
2016-02-19	Carlos Martín Nieto	Merge pull request #3597 from ethomson/filter_registration	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3604 from ethomson/nsec_xplat	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3606 from ethomson/drop_xp	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3613 from ethomson/fixups	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3619 from ethomson/win32_forbidden	blob \| commitdiff \| raw \| diff to current
2016-02-11	Carlos Martín Nieto	Merge pull request #3610 from ethomson/rebase_bare	blob \| commitdiff \| raw \| diff to current
2016-02-11	Edward Thomson	Merge pull request #3612 from arthurschreiber/arthur...	blob \| commitdiff \| raw \| diff to current
2016-02-11	Arthur Schreiber	Horrible fix for #3173.	blob \| commitdiff \| raw \| diff to current
2016-02-09	Vicent Marti	Merge pull request #3599 from libgit2/gpgsign	blob \| commitdiff \| raw \| diff to current
2016-02-09	Carlos Martín Nieto	Merge pull request #3602 from libgit2/cmn/header-field-2	blob \| commitdiff \| raw \| diff to current
2016-02-09	Carlos Martín Nieto	Merge pull request #3598 from pks-t/pks/coverity-fixes	blob \| commitdiff \| raw \| diff to current
2016-02-08	Patrick Steinhardt	merge: fix memory leak	blob \| commitdiff \| raw \| diff to current
2015-12-26	Edward Thomson	Merge pull request #3546 from Cruel/master	blob \| commitdiff \| raw \| diff to current
2015-12-16	Carlos Martín Nieto	Merge pull request #3548 from tepas/patch-1	blob \| commitdiff \| raw \| diff to current
2015-12-16	Carlos Martín Nieto	Merge pull request #3549 from libgit2/vmg/index-fill	blob \| commitdiff \| raw \| diff to current
2015-12-16	Vicent Marti	merge: Use `git_index__fill` to populate the index	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	recursive merge: add a recursion limit	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: handle conflicts in recursive base building	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: use annotated commits for recursion	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: merge annotated commits instead of regular commits	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: octopus merge common ancestors when >2	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: compute octopus merge bases	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: build virtual base of multiple merge bases	blob \| commitdiff \| raw \| diff to current
next

The git library used in some Proxmox tool chains

RSS Atom