Commit Graph

2455 Commits (3cfb2558b686f7bdaaae54b6550a6ee5cbfe8ff6)

Author SHA1 Message Date
Junio C Hamano cf19d6a4d3 Meta/Make: disable unit tests when --tests=<num> is given 2024-04-18 08:54:46 -07:00
Junio C Hamano e6a0fc2e0e What's cooking (2024/04 #06) 2024-04-17 15:18:29 -07:00
Junio C Hamano d0dc5bf114 What's cooking (2024/04 #05) 2024-04-12 15:21:49 -07:00
Junio C Hamano 781df13f3b What's cooking (2024/04 #04) 2024-04-09 14:56:48 -07:00
Junio C Hamano dcad79e4bc What's cooking (2024/04 #03) 2024-04-05 11:36:18 -07:00
Junio C Hamano e973a9239f What's cooking (2024/04 #02) 2024-04-03 15:41:09 -07:00
Junio C Hamano 4b384fc611 What's cooking (2024/04 #01) 2024-04-01 11:38:22 -07:00
Junio C Hamano 1fbab3dc4d gitlab URLs update
Switch from an unmaintained https://gitlab.com/git-vcs/git to
https://gitlab.com/git-scm/git.  The info came from Patrick
Steinhardt <ps@pks.im>
2024-03-29 11:13:50 -07:00
Junio C Hamano 078c8813e7 What's cooking (2024/03 #09) 2024-03-28 14:48:53 -07:00
Junio C Hamano 57da6293b2 Meta/Maintnotes: clarify "uninteresting topic" 2024-03-26 12:06:06 -07:00
Junio C Hamano 567bbef5cf What's cooking (2024/03 #08) 2024-03-26 11:29:44 -07:00
Junio C Hamano 3701f6fa8c What's cooking (2024/03 #07) 2024-03-22 15:09:20 -07:00
Junio C Hamano 11f2323bdc Meta/cook: notice an unused extra command line arg and fail 2024-03-20 09:47:05 -07:00
Junio C Hamano ff5dce782f MaintNotes: spring cleaning 2024-03-20 09:47:05 -07:00
Junio C Hamano 9960e535df What's cooking (2024/03 #05) 2024-03-19 07:52:23 -07:00
Junio C Hamano 42910d7ec9 What's cooking (2024/03 #04) 2024-03-15 16:31:56 -07:00
Junio C Hamano 74c44febb4 What's cooking (2024/03 #03) 2024-03-11 15:39:19 -07:00
Junio C Hamano 34cee3057e Meta/Reintegrate: work on a detached head 2024-03-08 21:47:27 -08:00
Junio C Hamano c723e1ca77 What's cooking (2024/03 #02) 2024-03-07 17:10:27 -08:00
Junio C Hamano 1b60a6f7b5 What's cooking (2024/03 #01) 2024-03-04 14:35:56 -08:00
Junio C Hamano 495ae5bc8a What's cooking (2024/02 #09) 2024-02-27 16:36:48 -08:00
Junio C Hamano 0a75d7853c Meta/CannedResponses
A collection of suggestions and guidance messages we often give to
relatively new contributors.
2024-02-23 00:00:01 -08:00
Junio C Hamano d9de65ab5e What's cooking (2024/02 #08) 2024-02-23 00:00:00 -08:00
Junio C Hamano 2935a828f3 What's cooking (2024/02 #07) 2024-02-20 08:18:33 -08:00
Junio C Hamano 3230a854c1 What's cooking (2024/02 #06) 2024-02-15 16:21:03 -08:00
Junio C Hamano 55dcc7360b What's cooking (2024/02 #05) 2024-02-13 14:22:24 -08:00
Junio C Hamano 07ffb4fd1f What's cooking (2024/02 #04) 2024-02-08 22:26:47 -08:00
Junio C Hamano 111690af4f What's cooking (2024/02 #03) 2024-02-06 15:04:45 -08:00
Junio C Hamano 12caff32f3 What's cooking (2024/02 #02) 2024-02-02 21:19:11 -08:00
Junio C Hamano 00e4c218fb What's cooking (2024/02 #01) 2024-02-02 14:30:15 -08:00
Junio C Hamano 4f629ece2c What's cooking (2024/01 #09) 2024-01-29 16:32:06 -08:00
Junio C Hamano 71a98b084b Meta/loop-rebuild: raise parallelism a bit 2024-01-26 14:41:10 -08:00
Junio C Hamano 59dece08c4 What's cooking (2024/01 #08) 2024-01-26 14:38:51 -08:00
Junio C Hamano 1729afb6c6 What's cooking (2024/01 #07) 2024-01-23 14:29:46 -08:00
Junio C Hamano e07100009d What's cooking (2024/01 #06) 2024-01-19 17:05:28 -08:00
Junio C Hamano 3e495d4686 What's cooking (2024/01 #05) 2024-01-16 12:42:55 -08:00
Junio C Hamano 60596280d8 What's cooking (2024/01 #04) 2024-01-11 17:38:41 -08:00
Junio C Hamano 71a1d66a97 What's cooking (2024/01 #03) 2024-01-09 15:08:47 -08:00
Junio C Hamano 7b5e748701 What's cooking (2024/01 #02) 2024-01-05 15:53:46 -08:00
Junio C Hamano a86778aa51 What's cooking (2024/01 #01) 2024-01-02 14:27:43 -08:00
Junio C Hamano 489058b80d What's cooking (2023/12 #05) 2023-12-27 16:21:59 -08:00
Junio C Hamano 18571e56f7 Meta/RB: retire unused script that was written long time ago 2023-12-20 13:37:44 -08:00
Junio C Hamano 8e24d41a26 What's cooking (2023/12 #04) 2023-12-20 13:36:48 -08:00
Junio C Hamano 1c4c56b885 Meta/round: make it easier to find the beginning of each task 2023-12-20 12:32:28 -08:00
Junio C Hamano 27bf3ab440 Meta/Summary: avoid paging individual steps 2023-12-20 12:30:16 -08:00
Junio C Hamano a36bff7006 What's cooking (2023/12 #03) 2023-12-18 14:40:13 -08:00
Junio C Hamano 2d886b02d1 Meta/round: test with sha256, too 2023-12-12 17:05:13 -08:00
Junio C Hamano aaf962df4a Reintegrate: cope with delete-modify conflicts
A more proper solution is probably to teach "rerere" to remember
what modification (probably indexed via a patch ID for flexibility,
but either the pre- or post-image blob ID without such flexibility
is probably good enough) was deemed "uninteresting" to resolve in
favor of deletion and reapply it when we see another delete-modify
conflict with the same modification, but for now, treat all
delete-modify conflict to be with uninteresting modification.

The way the Reintegrate machinery is used makes it somewhat safer
than it looks---the initial attempt to merge (and come up with a
merge-fix if needed) will always be done using "git merge" and the
resulting commit is manually examined (if only to see if there is a
need for a further merge-fix) before redo-foo script is written out
of the resulting history.  We'll need to deal with a case where a
modifying side need to be kept over the deleting side if/when it
arises, but so far I haven't seen such a case in real life.
2023-12-11 12:40:09 -08:00
Junio C Hamano a332d1db1d What's cooking (2023/12 #02) 2023-12-11 12:39:26 -08:00
Junio C Hamano 4dec8a351a What's cooking (2023/12 #01) 2023-12-08 17:41:51 -08:00