summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)Author
2015-06-05Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano
2015-05-14rerere: exit silently on "forget" when rerere is disabledJeff King
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
2011-05-08rerere: libify rerere_clear() and rerere_gc()Junio C Hamano
2011-04-03sparse: Fix errors and silence warningsStephen Boyd
2011-03-27Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano
2011-03-23rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano
2011-02-16rerere "remaining"Martin von Zweigbergk
2010-10-27Merge branch 'jf/merge-ignore-ws'Junio C Hamano
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder
2010-08-06rerere: never renormalizeJonathan Nieder
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder
2010-07-14rerere: fix overeager gcSZEDER Gábor
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-02-23rerere: fix memory leak if rerere images can't be readBert Wesarg
2010-01-28rerere: fix too-short initializationJeff King
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano
2010-01-17rerere: honor conflict-marker-size attributeJunio C Hamano
2010-01-17rerere: prepare for customizable conflict marker lengthJunio C Hamano
2010-01-17rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano