summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WIP forgetjc/rerere-multi-wipJunio C Hamano2016-03-211-27/+69
* rerere: split code to call ll_merge() furtherJunio C Hamano2016-03-151-16/+31
* rerere: move code related to "forget" togetherJunio C Hamano2016-03-151-97/+97
* rerere: gc and clearJunio C Hamano2016-03-152-46/+123
* rerere: do use multiple variantsJunio C Hamano2016-03-152-39/+61
* t4200: rerere a merge with two identical conflictsJunio C Hamano2016-03-151-0/+74
* rerere: allow multiple variants to existJunio C Hamano2016-03-152-22/+106
* rerere: delay the recording of preimageJunio C Hamano2016-03-151-27/+25
* rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-152-18/+41
* rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano2016-02-081-3/+29
* rerere: split conflict ID furtherJunio C Hamano2016-02-082-6/+58
* rerere: replace strcpy with xsnprintfjk/rerere-xsnprintfJeff King2016-02-081-2/+2
* 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-243-28/+85
* rerere: call conflict-ids IDsJunio C Hamano2015-07-243-41/+41
* 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
* Git 2.3.8v2.3.8Junio C Hamano2015-05-114-3/+26
* Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano2015-05-116-15/+16
|\
| * log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regexMatthieu Moy2015-04-202-5/+5
| * Documentation: change -L:<regex> to -L:<funcname>Matthieu Moy2015-04-204-10/+11
* | Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2015-05-112-2/+98
|\ \
| * | diff-no-index: align D/F handling with that of normal Gitjc/diff-no-index-d-fJunio C Hamano2015-03-262-2/+33
| * | diff-no-index: DWIM "diff D F" into "diff D/F F"Junio C Hamano2015-03-252-0/+65
* | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano2015-05-111-2/+2
|\ \ \
| * | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-sectionOssi Herrala2015-04-171-2/+2
* | | | Merge branch 'jc/epochtime-wo-tz' into maint-2.3Junio C Hamano2015-05-111-5/+9
|\ \ \ \
| * | | | parse_date_basic(): let the system handle DST conversionjc/epochtime-wo-tzJunio C Hamano2015-04-151-2/+6
| * | | | parse_date_basic(): return early when given a bogus timestampJunio C Hamano2015-04-151-3/+3
| | |/ / | |/| |
* | | | Git 2.3.7v2.3.7Junio C Hamano2015-04-274-3/+25
* | | | Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-273-16/+24
|\ \ \ \
| * | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fixTorsten Bögershausen2015-04-083-16/+24
* | | | | Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-271-1/+1
|\ \ \ \ \
| * | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-xMárcio Almada2015-04-121-1/+1
| | |/ / / | |/| | |
View Lorry Controller Status