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

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

2015-07-24	Edward Thomson	Merge pull request #3303 from libgit2/cmn/index-add...	blob \| commitdiff \| raw
2015-07-24	Edward Thomson	Merge pull request #3305 from libgit2/cmn/reflog-del...	blob \| commitdiff \| raw
2015-07-24	Edward Thomson	Merge pull request #3304 from libgit2/cmn/checkout...	blob \| commitdiff \| raw
2015-07-22	joshaber	Merge branch 'master' into fix-init-ordering	blob \| commitdiff \| raw
2015-07-15	Edward Thomson	Merge pull request #3311 from Fallso/MacroRedefinition	blob \| commitdiff \| raw
2015-07-13	Carlos Martín Nieto	Merge pull request #3302 from libgit2/cmn/submodule...	blob \| commitdiff \| raw
2015-07-13	Carlos Martín Nieto	Merge pull request #3306 from libgit2/cmn/fetch-ex...	blob \| commitdiff \| raw
2015-07-12	Carlos Martín Nieto	Merge branch 'portable-zu'	blob \| commitdiff \| raw
2015-07-12	Matthew Plough	Fix #3094 - improve use of portable size_t/ssize_t...	blob \| commitdiff \| raw
2015-07-09	Carlos Martín Nieto	Merge pull request #3281 from ethomson/wildcard_filters	blob \| commitdiff \| raw \| diff to current
2015-06-26	Carlos Martín Nieto	Merge pull request #3263 from git-up/fixes	blob \| commitdiff \| raw \| diff to current
2015-06-26	Carlos Martín Nieto	Merge pull request #3259 from ethomson/stash_apply_argh	blob \| commitdiff \| raw \| diff to current
2015-06-25	Edward Thomson	iterator: provide git_iterator_walk	blob \| commitdiff \| raw \| diff to current
2015-06-24	Edward Thomson	Merge pull request #3131 from urkud/const-char	blob \| commitdiff \| raw \| diff to current
2015-06-15	Carlos Martín Nieto	Merge pull request #3171 from libgit2/cmn/link-fallback	blob \| commitdiff \| raw \| diff to current
2015-06-15	Carlos Martín Nieto	Merge pull request #3217 from jeffhostetler/leak_checko...	blob \| commitdiff \| raw \| diff to current
2015-06-12	Carlos Martín Nieto	Merge pull request #3215 from jeffhostetler/windows_lea...	blob \| commitdiff \| raw \| diff to current
2015-06-11	Carlos Martín Nieto	Merge pull request #3155 from mgorny/userpass-const	blob \| commitdiff \| raw \| diff to current
2015-06-10	Edward Thomson	Merge pull request #3174 from libgit2/cmn/idx-fill...	blob \| commitdiff \| raw \| diff to current
2015-06-10	Edward Thomson	Merge pull request #3201 from libgit2/cmn/coverity	blob \| commitdiff \| raw \| diff to current
2015-06-10	Carlos Martín Nieto	merge: actually increment the counts, not the pointers	blob \| commitdiff \| raw \| diff to current
2015-06-08	Carlos Martín Nieto	Merge pull request #3165 from ethomson/downcase	blob \| commitdiff \| raw \| diff to current
2015-05-31	Carlos Martín Nieto	Merge pull request #3152 from tkelman/patch-1	blob \| commitdiff \| raw \| diff to current
2015-05-29	Carlos Martín Nieto	Merge pull request #3157 from mgorny/ssh_memory_auth	blob \| commitdiff \| raw \| diff to current
2015-05-29	Carlos Martín Nieto	Merge pull request #3163 from ethomson/emergeconflict	blob \| commitdiff \| raw \| diff to current
2015-05-29	Edward Thomson	Rename GIT_EMERGECONFLICT to GIT_ECONFLICT	blob \| commitdiff \| raw \| diff to current
2015-05-28	Carlos Martín Nieto	Merge pull request #3139 from ethomson/diff_conflicts	blob \| commitdiff \| raw \| diff to current
2015-05-28	Edward Thomson	introduce `git_index_entry_is_conflict`	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-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-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
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	Renamed git_merge_options 'flags' to 'tree_flags'	blob \| commitdiff \| raw \| diff to current
2015-03-16	Jacques Germishuys	Allow for merges with whitespace discrepancies	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	Carlos Martín Nieto	Merge pull request #2885 from JIghtuse/master	blob \| commitdiff \| raw \| diff to current
2015-02-20	Carlos Martín Nieto	Merge pull request #2907 from jasonhaslam/git_packfile_...	blob \| commitdiff \| raw \| diff to current
2015-02-19	Carlos Martín Nieto	Merge pull request #2820 from leoyanggit/mac_build	blob \| commitdiff \| raw \| diff to current
2015-02-15	Carlos Martín Nieto	Merge pull request #2831 from ethomson/merge_lock	blob \| commitdiff \| raw \| diff to current
2015-02-15	Carlos Martín Nieto	Merge pull request #2895 from ethomson/alloc_overflow	blob \| commitdiff \| raw \| diff to current
2015-02-14	Edward Thomson	indexwriter: an indexwriter for repo operations	blob \| commitdiff \| raw \| diff to current
2015-02-14	Edward Thomson	merge: lock the index at the start of the merge	blob \| commitdiff \| raw \| diff to current
2015-02-13	Edward Thomson	Make our overflow check look more like gcc/clang's	blob \| commitdiff \| raw \| diff to current
2015-02-13	Edward Thomson	allocations: test for overflow of requested size	blob \| commitdiff \| raw \| diff to current
2015-02-11	Carlos Martín Nieto	Merge pull request #2889 from jeffhostetler/jeffhostetl...	blob \| commitdiff \| raw \| diff to current
2015-01-14	Edward Thomson	Merge pull request #2818 from leoyanggit/openssl_option	blob \| commitdiff \| raw \| diff to current
2015-01-14	Edward Thomson	Merge branch 'pr/2740'	blob \| commitdiff \| raw \| diff to current
2015-01-14	Pierre-Olivier Latour	Always use GIT_HASHSIG_SMART_WHITESPACE when diffing...	blob \| commitdiff \| raw \| diff to current
2015-01-05	Carlos Martín Nieto	Merge commit 'refs/pull/2632/head' of github.com:libgit...	blob \| commitdiff \| raw \| diff to current
2014-12-30	Edward Thomson	Merge pull request #2761 from libgit2/cmn/fetch-prune	blob \| commitdiff \| raw \| diff to current
2014-12-30	Edward Thomson	Merge pull request #2762 from libgit2/cmn/hide-push	blob \| commitdiff \| raw \| diff to current
2014-12-30	Carlos Martín Nieto	Merge pull request #2785 from jacquesg/coverity	blob \| commitdiff \| raw \| diff to current
2014-12-29	Jacques Germishuys	Plug some leaks	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-27	Edward Thomson	Introduce git_rebase to set up a rebase session	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-10-10	Edward Thomson	Merge pull request #2574 from csware/hostname-for-certi...	blob \| commitdiff \| raw \| diff to current
2014-10-10	Edward Thomson	Merge pull request #2603 from libgit2/cmn/revwalk-merge...	blob \| commitdiff \| raw \| diff to current
2014-10-09	Carlos Martín Nieto	Merge pull request #2592 from libgit2/cmn/describe	blob \| commitdiff \| raw \| diff to current
2014-10-09	Edward Thomson	Merge pull request #2599 from linquize/config-trailing...	blob \| commitdiff \| raw \| diff to current
2014-10-09	Edward Thomson	Merge pull request #2601 from SeijiIto/master	blob \| commitdiff \| raw \| diff to current
2014-10-09	Edward Thomson	Merge pull request #2597 from ethomson/fixup	blob \| commitdiff \| raw \| diff to current
2014-10-09	Edward Thomson	Merge pull request #2448 from libgit2/cmn/reference...	blob \| commitdiff \| raw \| diff to current
2014-10-09	Edward Thomson	Merge pull request #2462 from libgit2/cmn/remote-fetch...	blob \| commitdiff \| raw \| diff to current
2014-10-09	Carlos Martín Nieto	Merge pull request #2604 from arthurschreiber/arthur...	blob \| commitdiff \| raw \| diff to current
2014-10-09	Arthur Schreiber	Extract shared functionality.	blob \| commitdiff \| raw \| diff to current
2014-10-09	Arthur Schreiber	Add git_merge_bases_many.	blob \| commitdiff \| raw \| diff to current
2014-10-01	Vicent Marti	Merge pull request #2594 from libgit2/vmg/hashsig	blob \| commitdiff \| raw \| diff to current
2014-10-01	Vicent Marti	hashsig: Export as a `sys` header	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
next

The git library used in some Proxmox tool chains

RSS Atom