summaryrefslogtreecommitdiff
path: root/Reintegrate
AgeCommit message (Expand)Author
2022-10-10Meta/Reintegrate: omit source message ID from the merge messageJunio C Hamano
2022-01-24Meta/Reintegrate: Breaks is a significant wordJunio C Hamano
2019-02-28Reintegrate: check coccicheck-pending, tooJunio C Hamano
2019-02-28Reintegrate: teach 'On hold' statusJunio C Hamano
2018-10-26Meta/Reintegrate: do not apply cocci unless the tip advancesJunio C Hamano
2018-10-23Meta/Reintegrate: allow applying cocci transformationJunio C Hamano
2018-05-17Meta/Reintegrate: allow output from Meta/cook -w to be pasted into the branch...Junio C Hamano
2017-10-16Meta/Reintegrate: make sure a merge stays a mergeJunio C Hamano
2017-07-07Meta/cook: catch 'will wait...', tooJunio C Hamano
2016-09-21Meta/Reintegrate: find the branch name literally in "What's cooking" reortJunio C Hamano
2016-06-23Meta/cook, Meta/Reintegrate: add a few more $willdo verbsJunio C Hamano
2016-06-23Meta/Reintegrate: give a blank to separate cut markJunio C Hamano
2016-06-23Meta/Reintegrate: omit everything after $willdo verbJunio C Hamano
2016-01-27Meta/cook: 'Still doing something' is another keyphraseJunio C Hamano
2015-03-06Meta/Reintegrate: need to override GIT_EDITORJunio C Hamano
2015-02-25Meta/Reintegrate: use older editions of what's cooking report as neededJunio C Hamano
2014-10-24Meta/Reintegrate: show what happened during the fix-upJunio C Hamano
2014-04-16Meta/Reintegrate: pass custom merge optionsJunio C Hamano
2013-11-22Meta/Reintegrate: pick up "Can wait in", tooJunio C Hamano
2013-07-19Meta/Reintegrate: ignroe whitespace when comparing list of topicsJunio C Hamano
2013-07-19Meta/Reintegrate: guard for misspelt topic nameJunio C Hamano
2013-05-24Reintegrate: remove the "what next" markers from log messagesJunio C Hamano
2013-01-09Meta/Reintegrate: omit cut mark if no topics were merged from the groupJunio C Hamano
2013-01-09Meta/Reintegrate: try keeping the cut points with commentsJunio C Hamano
2013-01-03Meta/Reintegrate: report the "cut" pointsJunio C Hamano
2012-10-24Reintegrate: use --no-decorate with log --onelineJeff King
2012-09-14Meta/cook: format the topic description with indentationJunio C Hamano
2012-07-16Meta/Reintegrate: force invoking the editor when mergingJunio C Hamano
2012-06-28Meta/Reintegrate: work around minor --no-edit breakageJunio C Hamano
2012-04-27Meta/Reintegrate: stop at a cut ### lineJunio C Hamano
2012-03-16Meta/Reintegrate: allow each step to be optionally amendedJunio C Hamano
2012-03-12Meta/Reintegrate: propagate branch description from whats-cooking.txtJunio C Hamano
2012-03-12Meta/Reintegrate: redo the rerere partJunio C Hamano
2012-02-10Meta/Reintegrate: use merge --no-editJunio C Hamano
2011-10-19Meta/Reintegrate: allow comment in redo listJunio C Hamano
2011-05-19Meta/Reintegrate: -u should default to safer "n" optionJunio C Hamano
2011-02-22Reintegrate: make merge-fix-up more noticeableJunio C Hamano
2010-12-08Reintegrate: abort the whole thing when commit is abortedJunio C Hamano
2010-07-08Meta/Reintegrate: make generated scripts support -u/-d options themselvesJunio C Hamano
2010-05-26Reintegrate: allow regeneration of test integration on a detached HEADJunio C Hamano
2010-05-03Reintegrate: do not fail when garbage is found in the orignalJunio C Hamano
2010-03-20Reintegrate: allow comments in the inputJunio C Hamano
2010-02-24Reintegrate: allow update/diffJunio C Hamano
2010-01-10Reintegrate: handle merging from remote tracking branchesJunio C Hamano
2009-11-26Reintegrate: move sequencer code out of the outputJunio C Hamano
2009-11-14Meta/Reintegrate: allow refs/merge-fix/* to supply evil-merge-fixupsJunio C Hamano
2009-11-14Meta/Reintegrate: do not trigger pre-commit filter on mergesJunio C Hamano
2009-04-02Reintegrate: only detect conflict markers in conflicted filesJunio C Hamano
2009-03-30Reintegrate: Accept rerere by defaultJunio C Hamano
2009-02-14Reintegrate: sometimes a specific cherry-pick need to be carried forwardJunio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-05-18 11:12:33 (GMT)