Age | Commit message (Collapse) | Author | |
---|---|---|---|
2024-01-24 | What's cooking (2024/01 #07)todo | Junio C Hamano | |
2024-01-20 | What's cooking (2024/01 #06) | Junio C Hamano | |
2024-01-16 | What's cooking (2024/01 #05) | Junio C Hamano | |
2024-01-12 | What's cooking (2024/01 #04) | Junio C Hamano | |
2024-01-10 | What's cooking (2024/01 #03) | Junio C Hamano | |
2024-01-06 | What's cooking (2024/01 #02) | Junio C Hamano | |
2024-01-03 | What's cooking (2024/01 #01) | Junio C Hamano | |
2023-12-28 | What's cooking (2023/12 #05) | Junio C Hamano | |
2023-12-21 | Meta/RB: retire unused script that was written long time ago | Junio C Hamano | |
2023-12-21 | What's cooking (2023/12 #04) | Junio C Hamano | |
2023-12-20 | Meta/round: make it easier to find the beginning of each task | Junio C Hamano | |
2023-12-20 | Meta/Summary: avoid paging individual steps | Junio C Hamano | |
2023-12-19 | What's cooking (2023/12 #03) | Junio C Hamano | |
2023-12-13 | Meta/round: test with sha256, too | Junio C Hamano | |
2023-12-11 | Reintegrate: cope with delete-modify conflicts | Junio C Hamano | |
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 | What's cooking (2023/12 #02) | Junio C Hamano | |
2023-12-09 | What's cooking (2023/12 #01) | Junio C Hamano | |
2023-11-27 | What's cooking (2023/11 #09) | Junio C Hamano | |
2023-11-23 | V: use the describe --long format | Junio C Hamano | |
This will hopefully help catching a mistake to tag different commits with the same tag again. | |||
2023-11-20 | What's cooking (2023/11 #08) | Junio C Hamano | |
2023-11-17 | What's cooking (2023/11 #07) | Junio C Hamano | |
2023-11-14 | What's cooking (2023/11 #06) | Junio C Hamano | |
2023-11-13 | What's cooking (2023/11) #05 | Junio C Hamano | |
2023-11-08 | What's cooking (2023/11) #04 | Junio C Hamano | |
2023-11-08 | CheckPush: 'next' could be identical to 'master' | Junio C Hamano | |
2023-11-08 | What's cooking (2023/11) #03 | Junio C Hamano | |
2023-11-08 | retire unused scripts | Junio C Hamano | |
2023-11-06 | What's cooking (2023/11) #02 | Junio C Hamano | |
2023-11-06 | loop-rebuild: no point rebuilding everything from scratch | Junio C Hamano | |
2023-11-02 | What's cooking (2023/11 #01) | Junio C Hamano | |
2023-10-29 | What's cooking (2023/10 #09) | Junio C Hamano | |
2023-10-22 | What's cooking (2023/10 #08) | Junio C Hamano | |
2023-10-19 | What's cooking (2023/10 #07) | Junio C Hamano | |
2023-10-14 | What's cooking (2023/10 #06) | Junio C Hamano | |
2023-10-13 | What's cooking (2023/10 #05) | Junio C Hamano | |
2023-10-11 | What's cooking (2023/10 #04) | Junio C Hamano | |
2023-10-07 | What's cooking (2023/10 #03) | Junio C Hamano | |
Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||
2023-10-05 | What's cooking (2023/10 #02) | Junio C Hamano | |
2023-10-03 | What's cooking (2023/10 #01) | Junio C Hamano | |
2023-09-29 | What's cooking (2023/09 #09) | Junio C Hamano | |
2023-09-26 | What's cooking (2023/09 #08) | Junio C Hamano | |
2023-09-23 | What's cooking (2023/09 #07) | Junio C Hamano | |
2023-09-20 | What's cooking (2023/09 #06) | Junio C Hamano | |
2023-09-16 | What's cooking (2023/09 #05) | Junio C Hamano | |
2023-09-12 | What's cooking (2023/09 #04) | Junio C Hamano | |
2023-09-09 | Meta/V: give summary hash at the end | Junio C Hamano | |
2023-09-09 | What's cooking (2023/09 #03) | Junio C Hamano | |
2023-09-06 | What's cooking (2023/09 #02) | Junio C Hamano | |
2023-09-02 | What's cooking (2023/09 #01) | Junio C Hamano | |
2023-08-30 | add loop-rebuild script | Junio C Hamano | |