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
Junio C Hamano
16da7cb02f
What's cooking (2023/11 #09 )
2023-11-27 21:40:42 +09:00
Junio C Hamano
87abcd426a
V: use the describe --long format
...
This will hopefully help catching a mistake to tag different commits
with the same tag again.
2023-11-23 13:28:43 +09:00
Junio C Hamano
ffc30cf220
What's cooking (2023/11 #08 )
2023-11-20 19:48:25 +09:00
Junio C Hamano
262d1e3a5e
What's cooking (2023/11 #07 )
2023-11-17 14:25:39 +09:00
Junio C Hamano
c3a10c1c70
What's cooking (2023/11 #06 )
2023-11-15 02:08:01 +09:00
Junio C Hamano
2057d50997
What's cooking (2023/11) #05
2023-11-13 12:52:55 +09:00
Junio C Hamano
bb2ddb08c1
What's cooking (2023/11) #04
2023-11-09 02:01:15 +09:00
Junio C Hamano
34e2cba416
CheckPush: 'next' could be identical to 'master'
2023-11-09 02:01:15 +09:00
Junio C Hamano
8fba660e85
What's cooking (2023/11) #03
2023-11-09 02:01:04 +09:00
Junio C Hamano
c59a7f2337
retire unused scripts
2023-11-09 02:00:35 +09:00
Junio C Hamano
3a49405f0b
What's cooking (2023/11) #02
2023-11-06 10:42:46 +09:00
Junio C Hamano
f5b1d53d74
loop-rebuild: no point rebuilding everything from scratch
2023-11-06 10:40:15 +09:00
Junio C Hamano
13ede09638
What's cooking (2023/11 #01 )
2023-11-02 16:04:24 +09:00
Junio C Hamano
dc33f2c18a
What's cooking (2023/10 #09 )
2023-10-30 05:42:21 +09:00
Junio C Hamano
0b8ef193e4
What's cooking (2023/10 #08 )
2023-10-22 11:08:30 -07:00
Junio C Hamano
357bf7b679
What's cooking (2023/10 #07 )
2023-10-18 14:22:05 -07:00
Junio C Hamano
6387d821ba
What's cooking (2023/10 #06 )
2023-10-14 09:09:16 -07:00
Junio C Hamano
c08bc20a6b
What's cooking (2023/10 #05 )
2023-10-12 14:07:03 -07:00
Junio C Hamano
01dac2f5e6
What's cooking (2023/10 #04 )
2023-10-10 15:23:53 -07:00
Junio C Hamano
d988a4b8d7
What's cooking (2023/10 #03 )
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-10-06 16:56:52 -07:00
Junio C Hamano
0b985726b7
What's cooking (2023/10 #02 )
2023-10-04 15:43:45 -07:00
Junio C Hamano
d8ea3e7a34
What's cooking (2023/10 #01 )
2023-10-02 15:27:42 -07:00
Junio C Hamano
c6657dee71
What's cooking (2023/09 #09 )
2023-09-28 14:09:09 -07:00
Junio C Hamano
6833dc9feb
What's cooking (2023/09 #08 )
2023-09-25 15:41:15 -07:00
Junio C Hamano
42d3733986
What's cooking (2023/09 #07 )
2023-09-22 17:40:46 -07:00
Junio C Hamano
94ea1d925d
What's cooking (2023/09 #06 )
2023-09-19 15:47:42 -07:00
Junio C Hamano
e9a185d825
What's cooking (2023/09 #05 )
2023-09-15 16:32:54 -07:00
Junio C Hamano
4d69cf7a58
What's cooking (2023/09 #04 )
2023-09-12 09:23:23 -07:00
Junio C Hamano
2a393571e5
Meta/V: give summary hash at the end
2023-09-08 15:50:08 -07:00
Junio C Hamano
4d456c54bf
What's cooking (2023/09 #03 )
2023-09-08 14:35:40 -07:00
Junio C Hamano
05c5b73108
What's cooking (2023/09 #02 )
2023-09-05 16:54:42 -07:00
Junio C Hamano
c88cb83533
What's cooking (2023/09 #01 )
2023-09-01 14:17:20 -07:00
