summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-03-15t4200: rerere a merge with two identical conflictsJunio C Hamano
2016-03-15rerere: allow multiple variants to existJunio C Hamano
2016-03-15rerere: delay the recording of preimageJunio C Hamano
2016-03-15rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano
2016-02-08rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano
2016-02-08rerere: split conflict ID furtherJunio C Hamano
2016-02-08rerere: replace strcpy with xsnprintfJeff 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-11Git 2.3.8v2.3.8Junio C Hamano
2015-05-11Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano
2015-05-11Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano
2015-05-11Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano
2015-05-11Merge branch 'jc/epochtime-wo-tz' into maint-2.3Junio C Hamano
2015-04-27Git 2.3.7v2.3.7Junio C Hamano
2015-04-27Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano
2015-04-27Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano
2015-04-27Merge branch 'jc/push-cert' into maintJunio C Hamano
2015-04-21Git 2.3.6v2.3.6Junio C Hamano
2015-04-21Merge branch 'jk/colors' into maintJunio C Hamano
2015-04-21Merge branch 'jk/test-annoyances' into maintJunio C Hamano
2015-04-21Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano
2015-04-21Merge branch 'jz/gitweb-conf-doc-fix' into maintJunio C Hamano
2015-04-21Merge branch 'jk/cherry-pick-docfix' into maintJunio C Hamano
2015-04-21Merge branch 'iu/fix-parse-options-h-comment' into maintJunio C Hamano
2015-04-21Merge branch 'jg/cguide-we-cannot-count' into maintJunio C Hamano
2015-04-21Merge branch 'jk/pack-corruption-post-mortem' into maintJunio C Hamano
2015-04-21Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maintJunio C Hamano
2015-04-20log -L: improve error message on malformed argumentMatthieu Moy
2015-04-20Documentation: change -L:<regex> to -L:<funcname>Matthieu Moy
2015-04-17config: fix settings in default_user_config templateOssi Herrala
generated by cgit v0.10.2-6-g49f6 at 2024-04-27 21:51:39 (GMT)