path: root/merge-recursive.c
AgeCommit message (Expand)Author
2014-10-14Merge branch 'mh/lockfile'Junio C Hamano
2014-10-14Merge branch 'da/include-compat-util-first-in-c'Junio C Hamano
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-09-30Merge branch 'sb/merge-recursive-copy-paste-fix'Junio C Hamano
2014-09-23merge-recursive: remove stale commented debugging codeStefan Beller
2014-09-23merge-recursive: fix copy-paste mistakeStefan Beller
2014-09-19Merge branch 'rs/export-strbuf-addchars'Junio C Hamano
2014-09-15cleanups: ensure that git-compat-util.h is included firstDavid Aguilar
2014-09-08strbuf: use strbuf_addchars() for adding a char multiple timesRené Scharfe
2014-08-13merge-recursive.c: replace `git_config()` with `git_config_get_int()`Tanay Abhra
2014-07-23Merge branch 'ta/string-list-init'Junio C Hamano
2014-07-21replace memset with string-list initializersTanay Abhra
2014-07-16Merge branch 'rs/code-cleaning'Junio C Hamano
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-07-10use strbuf_addch for adding single charactersRené Scharfe
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano
2014-07-09Merge branch 'jk/skip-prefix'Junio C Hamano
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano
2014-06-20use skip_prefix to avoid repeating stringsJeff King
2014-06-19unique_path: fix unlikely heap overflowJeff King
2014-06-19use xstrfmt to replace xmalloc + sprintfJeff King
2014-06-13commit: record buffer length in cacheJeff King
2014-06-13use get_commit_buffer everywhereJeff King
2014-06-13cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy
2014-06-12do not create "struct commit" with xcallocJeff King
2014-05-07merge-recursive.c: fix case-changing merge bugDavid Turner
2014-03-18Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano
2014-02-27Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexBrad King
2014-02-24read-cache.c: extend make_cache_entry refresh flag with optionsBrad King
2014-01-27Merge branch 'mh/safe-create-leading-directories'Junio C Hamano
2014-01-06safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder
2013-10-28Merge branch 'jk/diff-algo' into maintJunio C Hamano
2013-10-14Merge branch 'jk/diff-algo'Jonathan Nieder
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionJohn Keeping
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano
2013-07-15remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik
2012-12-10Which merge_file() function do you mean?Junio C Hamano
2012-09-14Merge branch 'rj/path-cleanup'Junio C Hamano
2012-09-04Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano
2012-08-22Merge branch 'tr/merge-recursive-flush'Junio C Hamano
2012-08-05merge-recursive: separate message for common ancestorsRalf Thielow
2012-08-03merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast
2012-08-03diff_setup_done(): return voidThomas Rast
2012-07-27i18n: merge-recursive: mark strings for translationJiang Xin