summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)Author
2015-10-05Merge branch 'jc/rerere'Junio C Hamano
2015-09-01rerere: release lockfile in non-writing functionsJeff King
2015-08-10memoize common git-path "constant" filesJeff King
2015-07-24rerere: un-nest merge() furtherJunio C Hamano
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano
2015-07-24rerere: call conflict-ids IDsJunio C Hamano
2015-07-24rerere: further clarify do_rerere_one_path()Junio C Hamano
2015-07-24rerere: further de-dent do_plain_rerere()Junio C Hamano
2015-07-24rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano
2015-07-24rerere: explain the remainderJunio C Hamano
2015-07-24rerere: explain "rerere forget" codepathJunio C Hamano
2015-07-24rerere: explain the primary codepathJunio C Hamano
2015-07-24rerere: explain MERGE_RR management helpersJunio C Hamano
2015-07-24rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano
2015-07-24rerere: explain the rerere I/O abstractionJunio C Hamano
2015-07-24rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano
2015-07-24rerere: stop looping unnecessarilyJunio C Hamano
2015-07-24rerere: drop want_sp parameter from is_cmarker()Junio C Hamano
2015-07-24rerere: report autoupdated paths only after actually updating themJunio C Hamano
2015-07-24rerere: write out each record of MERGE_RR in one goJunio C Hamano
2015-07-24rerere: lift PATH_MAX limitationJunio C Hamano
2015-07-24rerere: plug conflict ID leaksJunio C Hamano
2015-07-24rerere: handle conflicts with multiple stage #1 entriesJunio C Hamano
2015-06-28rerere: fix an off-by-one non-bugJunio C Hamano
2015-05-26Merge branch 'jk/rerere-forget-check-enabled'Junio C Hamano
2015-05-14rerere: exit silently on "forget" when rerere is disabledJeff King
2015-02-25Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano
2015-02-11Merge branch 'jn/rerere-fail-on-auto-update-failure'Junio C Hamano
2015-01-08rerere: error out on autoupdate failureJonathan Nieder
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-08-07rerere.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra
2014-07-16Merge branch 'rs/code-cleaning'Junio C Hamano
2014-07-10use strbuf_addbuf for adding strbufsRené Scharfe
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy
2014-02-24pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy
2014-02-24pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano
2013-07-15convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy
2013-07-15rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2013-04-04rerere forget: do not segfault if not all stages are presentJohannes Sixt
2013-04-02rerere forget: grok files containing NULJohannes Sixt
2012-09-16rerere.c: mark private file-scope symbols as staticJunio C Hamano
2012-07-16Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano
2012-07-09rerere: make rr-cache fanout directory honor umaskJunio C Hamano
2012-06-07rerere: remove i18n legos in result messageNguyễn Thái Ngọc Duy
2011-05-30Merge branch 'maint'Junio C Hamano
2011-05-30Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano
2011-05-26plug a DIR buffer leak in rerere.cJim Meyering
2011-05-26rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering