summaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/rerere'Junio C Hamano2015-10-051-151/+404
|\
| * rerere: un-nest merge() furtherjc/rerereJunio C Hamano2015-07-241-24/+26
| * rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-241-26/+73
| * rerere: call conflict-ids IDsJunio C Hamano2015-07-241-38/+38
| * rerere: further clarify do_rerere_one_path()Junio C Hamano2015-07-241-9/+6
| * rerere: further de-dent do_plain_rerere()Junio C Hamano2015-07-241-32/+33
| * rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano2015-07-241-35/+40
| * rerere: explain the remainderJunio C Hamano2015-07-241-0/+20
| * rerere: explain "rerere forget" codepathJunio C Hamano2015-07-241-0/+24
| * rerere: explain the primary codepathJunio C Hamano2015-07-241-13/+82
| * rerere: explain MERGE_RR management helpersJunio C Hamano2015-07-241-0/+41
| * rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano2015-07-241-1/+8
| * rerere: explain the rerere I/O abstractionJunio C Hamano2015-07-241-7/+31
| * rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano2015-07-241-2/+4
| * rerere: stop looping unnecessarilyJunio C Hamano2015-07-241-10/+7
| * rerere: drop want_sp parameter from is_cmarker()Junio C Hamano2015-07-241-5/+22
| * rerere: report autoupdated paths only after actually updating themJunio C Hamano2015-07-241-10/+12
| * rerere: write out each record of MERGE_RR in one goJunio C Hamano2015-07-241-7/+9
| * rerere: lift PATH_MAX limitationJunio C Hamano2015-07-241-20/+15
| * rerere: plug conflict ID leaksJunio C Hamano2015-07-241-2/+5
| * rerere: handle conflicts with multiple stage #1 entriesJunio C Hamano2015-07-241-1/+1
| * rerere: fix an off-by-one non-bugJunio C Hamano2015-06-281-4/+2
| * Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano2015-02-241-10/+6
| |\
* | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-2/+15
* | | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-11/+8
* | | Merge branch 'jk/rerere-forget-check-enabled'Junio C Hamano2015-05-261-0/+2
|\ \ \
| * | | rerere: exit silently on "forget" when rerere is disabledjk/rerere-forget-check-enabledJeff King2015-05-141-0/+2
* | | | Merge branch 'jn/rerere-fail-on-auto-update-failure'Junio C Hamano2015-02-111-10/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | rerere: error out on autoupdate failurejn/rerere-fail-on-auto-update-failureJonathan Nieder2015-01-081-10/+6
* | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* | | rerere.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra2014-08-071-31/+12
|/ /
* | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-161-2/+2
|\ \
| * | use strbuf_addbuf for adding strbufsRené Scharfe2014-07-101-2/+2
| |/
* | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-2/+1
|/
* pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-241-1/+1
* pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-241-2/+2
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-3/+4
|\
| * convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
| * rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-4/+5
* | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-6/+6
|/
* rerere forget: do not segfault if not all stages are presentJohannes Sixt2013-04-041-8/+7
* rerere forget: grok files containing NULJohannes Sixt2013-04-021-2/+4
* rerere.c: mark private file-scope symbols as staticJunio C Hamano2012-09-151-1/+1
* Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-151-1/+1
|\
| * rerere: make rr-cache fanout directory honor umaskJunio C Hamano2012-07-091-1/+1
* | rerere: remove i18n legos in result messageNguyễn Thái Ngọc Duy2012-06-071-6/+6
|/
* Merge branch 'maint'Junio C Hamano2011-05-301-2/+8
|\
| * Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano2011-05-301-2/+8
| |\
| | * rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering2011-05-261-2/+8
* | | plug a DIR buffer leak in rerere.cJim Meyering2011-05-261-0/+1
View Lorry Controller Status