summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2015-03-23merge-recursive: fix memleaksLibravatar Stefan Beller1-0/+3
2015-01-07Merge branch 'jc/merge-bases'Libravatar Junio C Hamano1-1/+1
2014-12-01tree.c: update read_tree_recursive callback to pass strbuf as baseLibravatar Nguyễn Thái Ngọc Duy1-9/+6
2014-10-30get_merge_bases(): always clean-up object flagsLibravatar Junio C Hamano1-1/+1
2014-10-14Merge branch 'mh/lockfile'Libravatar Junio C Hamano1-0/+1
2014-10-14Merge branch 'da/include-compat-util-first-in-c'Libravatar Junio C Hamano1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-09-29Merge branch 'sb/merge-recursive-copy-paste-fix'Libravatar Junio C Hamano1-5/+1
2014-09-23merge-recursive: remove stale commented debugging codeLibravatar Stefan Beller1-4/+0
2014-09-23merge-recursive: fix copy-paste mistakeLibravatar Stefan Beller1-1/+1
2014-09-19Merge branch 'rs/export-strbuf-addchars'Libravatar Junio C Hamano1-3/+1
2014-09-15cleanups: ensure that git-compat-util.h is included firstLibravatar David Aguilar1-1/+1
2014-09-08strbuf: use strbuf_addchars() for adding a char multiple timesLibravatar René Scharfe1-3/+1
2014-08-13merge-recursive.c: replace `git_config()` with `git_config_get_int()`Libravatar Tanay Abhra1-16/+6
2014-07-23Merge branch 'ta/string-list-init'Libravatar Junio C Hamano1-6/+3
2014-07-21replace memset with string-list initializersLibravatar Tanay Abhra1-6/+3
2014-07-16Merge branch 'rs/code-cleaning'Libravatar Junio C Hamano1-1/+1
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-7/+4
2014-07-16Merge branch 'jk/commit-buffer-length' into maintLibravatar Junio C Hamano1-2/+4
2014-07-10use strbuf_addch for adding single charactersLibravatar René Scharfe1-1/+1
2014-07-09Merge branch 'jk/xstrfmt'Libravatar Junio C Hamano1-23/+30
2014-07-09Merge branch 'jk/skip-prefix'Libravatar Junio C Hamano1-7/+8
2014-07-02Merge branch 'jk/commit-buffer-length'Libravatar Junio C Hamano1-2/+4
2014-06-20use skip_prefix to avoid repeating stringsLibravatar Jeff King1-7/+8
2014-06-19unique_path: fix unlikely heap overflowLibravatar Jeff King1-15/+26
2014-06-19use xstrfmt to replace xmalloc + sprintfLibravatar Jeff King1-8/+4
2014-06-13commit: record buffer length in cacheLibravatar Jeff King1-1/+1
2014-06-13use get_commit_buffer everywhereLibravatar Jeff King1-1/+3
2014-06-13cache-tree: mark istate->cache_changed on cache tree updateLibravatar Nguyễn Thái Ngọc Duy1-3/+1
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheLibravatar Nguyễn Thái Ngọc Duy1-4/+3
2014-06-12do not create "struct commit" with xcallocLibravatar Jeff King1-1/+1
2014-05-07merge-recursive.c: fix case-changing merge bugLibravatar David Turner1-0/+6
2014-03-18Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintLibravatar Junio C Hamano1-1/+3
2014-02-27Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Libravatar Junio C Hamano1-1/+3
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexLibravatar Brad King1-1/+2
2014-02-24read-cache.c: extend make_cache_entry refresh flag with optionsLibravatar Brad King1-1/+2
2014-01-27Merge branch 'mh/safe-create-leading-directories'Libravatar Junio C Hamano1-1/+1
2014-01-06safe_create_leading_directories(): introduce enum for return valuesLibravatar Michael Haggerty1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-3/+3
2013-10-28Merge branch 'jk/diff-algo' into maintLibravatar Junio C Hamano1-2/+2
2013-10-14Merge branch 'jk/diff-algo'Libravatar Jonathan Nieder1-2/+2
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionLibravatar John Keeping1-2/+2
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-1/+1
2013-07-15remove init_pathspec() in favor of parse_pathspec()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-3/+4
2013-01-16diff: Introduce --diff-algorithm command line optionLibravatar Michal Privoznik1-0/+9
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano1-3/+3
2012-09-14Merge branch 'rj/path-cleanup'Libravatar Junio C Hamano1-6/+7
2012-09-04Call mkpathdup() rather than xstrdup(mkpath(...))Libravatar Ramsay Jones1-6/+7
2012-08-22Merge branch 'tr/void-diff-setup-done'Libravatar Junio C Hamano1-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:28:08 +0000