summaryrefslogtreecommitdiff
path: root/Reintegrate
AgeCommit message (Expand)AuthorFilesLines
10 daysReintegrate, cook: adopt 'Looking good'Junio C Hamano1-1/+1
2026-07-20Meta/Reintegrate: allow preparing an update on a detached HEADJunio C Hamano1-1/+1
2026-06-17cook: 'Retracted' is a valid stateJunio C Hamano1-1/+1
2026-05-30Meta/Reintegrate: 'Comments?' is a valid statusJunio C Hamano1-1/+1
2026-05-11Meta/Reintegrate: die on, instead of silently ignore, an unknown mergeJunio C Hamano1-3/+2
2025-11-20Reintegrate: show cut linesJunio C Hamano1-2/+6
2024-07-29Meta/cook: fix the reference linksJunio C Hamano1-0/+1
2024-07-12Meta/cook: Sync What's cooking keywords between cook and Reintegrate scriptsJunio C Hamano1-1/+1
2024-07-11Meta/Reintegrate: allow 'pick' to be emptyJunio C Hamano1-1/+1
2024-07-11Meta/Reintegrate: -u should generate just onceJunio C Hamano1-3/+5
2024-03-08Meta/Reintegrate: work on a detached headJunio C Hamano1-13/+40
2023-12-11Reintegrate: cope with delete-modify conflictsJunio C Hamano1-0/+21
2022-10-10Meta/Reintegrate: omit source message ID from the merge messageJunio C Hamano1-0/+1
2022-01-24Meta/Reintegrate: Breaks is a significant wordJunio C Hamano1-2/+2
2019-03-01Reintegrate: check coccicheck-pending, tooJunio C Hamano1-2/+11
2019-03-01Reintegrate: teach 'On hold' statusJunio C Hamano1-1/+2
2018-10-26Meta/Reintegrate: do not apply cocci unless the tip advancesJunio C Hamano1-3/+13
2018-10-23Meta/Reintegrate: allow applying cocci transformationJunio C Hamano1-2/+32
2018-05-17Meta/Reintegrate: allow output from Meta/cook -w to be pasted into the branch...Junio C Hamano1-1/+1
2017-10-16Meta/Reintegrate: make sure a merge stays a mergeJunio C Hamano1-1/+1
2017-07-07Meta/cook: catch 'will wait...', tooJunio C Hamano1-1/+1
2016-09-21Meta/Reintegrate: find the branch name literally in "What's cooking" reortJunio C Hamano1-1/+1
2016-06-23Meta/cook, Meta/Reintegrate: add a few more $willdo verbsJunio C Hamano1-1/+1
2016-06-23Meta/Reintegrate: give a blank to separate cut markJunio C Hamano1-1/+1
2016-06-23Meta/Reintegrate: omit everything after $willdo verbJunio C Hamano1-1/+1
2016-01-26Meta/cook: 'Still doing something' is another keyphraseJunio C Hamano1-1/+1
2015-03-06Meta/Reintegrate: need to override GIT_EDITORJunio C Hamano1-3/+3
2015-02-24Meta/Reintegrate: use older editions of what's cooking report as neededJunio C Hamano1-20/+39
2014-10-24Meta/Reintegrate: show what happened during the fix-upJunio C Hamano1-0/+1
2014-04-16Meta/Reintegrate: pass custom merge optionsJunio C Hamano1-1/+3
2013-11-21Meta/Reintegrate: pick up "Can wait in", tooJunio C Hamano1-0/+1
2013-07-19Meta/Reintegrate: ignroe whitespace when comparing list of topicsJunio C Hamano1-2/+2
2013-07-19Meta/Reintegrate: guard for misspelt topic nameJunio C Hamano1-3/+5
2013-05-24Reintegrate: remove the "what next" markers from log messagesJunio C Hamano1-1/+20
2013-01-09Meta/Reintegrate: omit cut mark if no topics were merged from the groupJunio C Hamano1-3/+12
2013-01-08Meta/Reintegrate: try keeping the cut points with commentsJunio C Hamano1-4/+24
2013-01-03Meta/Reintegrate: report the "cut" pointsJunio C Hamano1-1/+7
2012-10-24Reintegrate: use --no-decorate with log --onelineJeff King1-1/+1
2012-09-13Meta/cook: format the topic description with indentationJunio C Hamano1-6/+9
2012-07-16Meta/Reintegrate: force invoking the editor when mergingJunio C Hamano1-1/+1
2012-06-27Meta/Reintegrate: work around minor --no-edit breakageJunio C Hamano1-1/+1
2012-04-27Meta/Reintegrate: stop at a cut ### lineJunio C Hamano1-1/+11
2012-03-16Meta/Reintegrate: allow each step to be optionally amendedJunio C Hamano1-2/+5
2012-03-12Meta/Reintegrate: propagate branch description from whats-cooking.txtJunio C Hamano1-1/+52
2012-03-12Meta/Reintegrate: redo the rerere partJunio C Hamano1-10/+7
2012-02-09Meta/Reintegrate: use merge --no-editJunio C Hamano1-1/+1
2011-10-19Meta/Reintegrate: allow comment in redo listJunio C Hamano1-2/+2
2011-05-18Meta/Reintegrate: -u should default to safer "n" optionJunio C Hamano1-1/+1
2011-02-22Reintegrate: make merge-fix-up more noticeableJunio C Hamano1-0/+1
2010-12-08Reintegrate: abort the whole thing when commit is abortedJunio C Hamano1-1/+1
generated by cgit (git 2.54.0.dirty) at 2026-09-13 05:39:36 +0000