summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-03-15t4200: rerere a merge with two identical conflictsLibravatar Junio C Hamano1-0/+74
2016-03-15rerere: allow multiple variants to existLibravatar Junio C Hamano2-22/+106
2016-03-15rerere: delay the recording of preimageLibravatar Junio C Hamano1-27/+25
2016-03-15rerere: handle leftover rr-cache/$ID directory and postimage filesLibravatar Junio C Hamano2-18/+41
2016-02-08rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idLibravatar Junio C Hamano1-3/+29
2016-02-08rerere: split conflict ID furtherLibravatar Junio C Hamano2-6/+58
2016-02-08rerere: replace strcpy with xsnprintfLibravatar Jeff King1-2/+2
2015-07-24rerere: un-nest merge() furtherLibravatar Junio C Hamano1-24/+26
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDLibravatar Junio C Hamano3-28/+85
2015-07-24rerere: call conflict-ids IDsLibravatar Junio C Hamano3-41/+41
2015-07-24rerere: further clarify do_rerere_one_path()Libravatar Junio C Hamano1-9/+6
2015-07-24rerere: further de-dent do_plain_rerere()Libravatar Junio C Hamano1-32/+33
2015-07-24rerere: refactor "replay" part of do_plain_rerere()Libravatar Junio C Hamano1-35/+40
2015-07-24rerere: explain the remainderLibravatar Junio C Hamano1-0/+20
2015-07-24rerere: explain "rerere forget" codepathLibravatar Junio C Hamano1-0/+24
2015-07-24rerere: explain the primary codepathLibravatar Junio C Hamano1-13/+82
2015-07-24rerere: explain MERGE_RR management helpersLibravatar Junio C Hamano1-0/+41
2015-07-24rerere: fix benign off-by-one non-bug and clarify codeLibravatar Junio C Hamano1-1/+8
2015-07-24rerere: explain the rerere I/O abstractionLibravatar Junio C Hamano1-7/+31
2015-07-24rerere: do not leak mmfile[] for a path with multiple stage #1 entriesLibravatar Junio C Hamano1-2/+4
2015-07-24rerere: stop looping unnecessarilyLibravatar Junio C Hamano1-10/+7
2015-07-24rerere: drop want_sp parameter from is_cmarker()Libravatar Junio C Hamano1-5/+22
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-11Git 2.3.8Libravatar Junio C Hamano4-3/+26
2015-05-11Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Libravatar Junio C Hamano6-15/+16
2015-05-11Merge branch 'jc/diff-no-index-d-f' into maint-2.3Libravatar Junio C Hamano2-2/+98
2015-05-11Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Libravatar Junio C Hamano1-2/+2
2015-05-11Merge branch 'jc/epochtime-wo-tz' into maint-2.3Libravatar Junio C Hamano1-5/+9
2015-04-27Git 2.3.7Libravatar Junio C Hamano4-3/+25
2015-04-27Merge branch 'tb/connect-ipv6-parse-fix' into maintLibravatar Junio C Hamano3-16/+24
2015-04-27Merge branch 'ma/bash-completion-leaking-x' into maintLibravatar Junio C Hamano1-1/+1
2015-04-27Merge branch 'jc/push-cert' into maintLibravatar Junio C Hamano1-0/+23
2015-04-21Git 2.3.6Libravatar Junio C Hamano4-3/+17
2015-04-21Merge branch 'jk/colors' into maintLibravatar Junio C Hamano1-2/+7
2015-04-21Merge branch 'jk/test-annoyances' into maintLibravatar Junio C Hamano5-15/+24
2015-04-21Merge branch 'pt/enter-repo-comment-fix' into maintLibravatar Junio C Hamano1-8/+3
2015-04-21Merge branch 'jz/gitweb-conf-doc-fix' into maintLibravatar Junio C Hamano1-1/+1
2015-04-21Merge branch 'jk/cherry-pick-docfix' into maintLibravatar Junio C Hamano1-1/+2
2015-04-21Merge branch 'iu/fix-parse-options-h-comment' into maintLibravatar Junio C Hamano1-2/+1
2015-04-21Merge branch 'jg/cguide-we-cannot-count' into maintLibravatar Junio C Hamano1-1/+1
2015-04-21Merge branch 'jk/pack-corruption-post-mortem' into maintLibravatar Junio C Hamano1-0/+237
2015-04-21Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maintLibravatar Junio C Hamano1-4/+0
2015-04-20log -L: improve error message on malformed argumentLibravatar Matthieu Moy2-5/+5
2015-04-20Documentation: change -L:<regex> to -L:<funcname>Libravatar Matthieu Moy4-10/+11
2015-04-17config: fix settings in default_user_config templateLibravatar Ossi Herrala1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 08:09:18 +0000