summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2015-07-24rerere: report autoupdated paths only after actually updating themLibravatar Junio C Hamano1-10/+12
2015-07-24rerere: write out each record of MERGE_RR in one goLibravatar Junio C Hamano1-7/+9
2015-07-24rerere: lift PATH_MAX limitationLibravatar Junio C Hamano1-20/+15
2015-07-24rerere: plug conflict ID leaksLibravatar Junio C Hamano1-2/+5
2015-07-24rerere: handle conflicts with multiple stage #1 entriesLibravatar Junio C Hamano1-1/+1
2015-06-28rerere: fix an off-by-one non-bugLibravatar Junio C Hamano1-4/+2
2015-05-26Merge branch 'jk/rerere-forget-check-enabled'Libravatar Junio C Hamano1-0/+2
2015-05-14rerere: exit silently on "forget" when rerere is disabledLibravatar Jeff King1-0/+2
2015-02-24Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintLibravatar Junio C Hamano1-10/+6
2015-02-11Merge branch 'jn/rerere-fail-on-auto-update-failure'Libravatar Junio C Hamano1-10/+6
2015-01-08rerere: error out on autoupdate failureLibravatar Jonathan Nieder1-10/+6
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-08-07rerere.c: replace `git_config()` with `git_config_get_*()` familyLibravatar Tanay Abhra1-31/+12
2014-07-16Merge branch 'rs/code-cleaning'Libravatar Junio C Hamano1-2/+2
2014-07-10use strbuf_addbuf for adding strbufsLibravatar René Scharfe1-2/+2
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheLibravatar Nguyễn Thái Ngọc Duy1-2/+1
2014-02-24pathspec: pass directory indicator to match_pathspec_item()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-02-24pathspec: rename match_pathspec_depth() to match_pathspec()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-3/+4
2013-07-15convert unmerge_cache to take struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-07-15rerere: convert to use parse_pathspecLibravatar Nguyễn Thái Ngọc Duy1-4/+5
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-6/+6
2013-04-04rerere forget: do not segfault if not all stages are presentLibravatar Johannes Sixt1-8/+7
2013-04-02rerere forget: grok files containing NULLibravatar Johannes Sixt1-2/+4
2012-09-15rerere.c: mark private file-scope symbols as staticLibravatar Junio C Hamano1-1/+1
2012-07-15Merge branch 'ar/clone-honor-umask-at-top'Libravatar Junio C Hamano1-1/+1
2012-07-09rerere: make rr-cache fanout directory honor umaskLibravatar Junio C Hamano1-1/+1
2012-06-07rerere: remove i18n legos in result messageLibravatar Nguyễn Thái Ngọc Duy1-6/+6
2011-05-30Merge branch 'maint'Libravatar Junio C Hamano1-2/+8
2011-05-30Merge branch 'jm/maint-misc-fix' into maintLibravatar Junio C Hamano1-2/+8
2011-05-26plug a DIR buffer leak in rerere.cLibravatar Jim Meyering1-0/+1
2011-05-26rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Libravatar Jim Meyering1-2/+8
2011-05-08rerere: libify rerere_clear() and rerere_gc()Libravatar Junio C Hamano1-0/+84
2011-04-03sparse: Fix errors and silence warningsLibravatar Stephen Boyd1-1/+1
2011-03-26Merge branch 'jc/maint-rerere-in-workdir'Libravatar Junio C Hamano1-2/+1
2011-03-23rerere: make sure it works even in a workdir attached to a young repositoryLibravatar Junio C Hamano1-2/+1
2011-02-16rerere "remaining"Libravatar Martin von Zweigbergk1-10/+68
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-1/+1
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+4
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Libravatar Junio C Hamano1-1/+7
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder1-1/+1
2010-08-06rerere: never renormalizeLibravatar Jonathan Nieder1-6/+5
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-5/+10
2010-07-14rerere: fix overeager gcLibravatar SZEDER Gábor1-1/+7
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Libravatar Thiago Farina1-5/+5
2010-06-30Merge branch 'jp/string-list-api-cleanup'Libravatar Junio C Hamano1-5/+5
2010-06-27string_list: Fix argument order for string_list_insertLibravatar Julian Phillips1-5/+5
2010-05-31enums: omit trailing comma for portabilityLibravatar Gary V. Vaughan1-1/+1
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-2/+2
2010-02-23rerere: fix memory leak if rerere images can't be readLibravatar Bert Wesarg1-3/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 21:28:33 +0000