git.ozlabs.org Git - next-scripts/history

]> git.ozlabs.org Git - next-scripts/history - do_merge

2024-11-07	Stephen Rothwell	do_merge: fix the branch name printed	blob \| commitdiff \| raw
2024-09-18	Stephen Rothwell	do_merge: make merging a tree an explicit operation	blob \| commitdiff \| raw \| diff to current
2024-09-16	Stephen Rothwell	do_merge: fix restarting when the next control line...	blob \| commitdiff \| raw \| diff to current
2024-08-29	Stephen Rothwell	track when I have to use an old version of a tree	blob \| commitdiff \| raw \| diff to current
2024-06-13	Stephen Rothwell	don't use a worktree for the fs_* branches	blob \| commitdiff \| raw \| diff to current
2024-05-29	Stephen Rothwell	implement switch to put some merges in sub branches	blob \| commitdiff \| raw \| diff to current
2023-07-10	Stephen Rothwell	do_merge: exit on build failure	blob \| commitdiff \| raw \| diff to current
2023-01-19	Stephen Rothwell	do_merge: just assume an existing SHA1s file means...	blob \| commitdiff \| raw \| diff to current
2023-01-18	Stephen Rothwell	do_merge: add the -c (continue) option	blob \| commitdiff \| raw \| diff to current
2023-01-12	Stephen Rothwell	do_merge: add duplicates to the log file	blob \| commitdiff \| raw \| diff to current
2023-01-11	Stephen Rothwell	detect duplicate patches	blob \| commitdiff \| raw \| diff to current
2022-12-14	Stephen Rothwell	do_merge: convert to a posix shell script	blob \| commitdiff \| raw \| diff to current
2021-09-16	Stephen Rothwell	begin to hide away the CRTL_FILE accesses	blob \| commitdiff \| raw \| diff to current
2021-09-16	Stephen Rothwell	do_build: update the SHA1 file before applying fixes	blob \| commitdiff \| raw \| diff to current
2021-09-16	Stephen Rothwell	make the merge messages more useful	blob \| commitdiff \| raw \| diff to current
2020-08-02	Stephen Rothwell	do_merge: report the correct branch name	blob \| commitdiff \| raw \| diff to current
2020-07-19	Stephen Rothwell	remove support for quilt trees	blob \| commitdiff \| raw \| diff to current
2019-10-03	Stephen Rothwell	add push-pending-fixes and notify when the branch is...	blob \| commitdiff \| raw \| diff to current
2019-07-26	Stephen Rothwell	do_merge: factor out manaul fix up points	blob \| commitdiff \| raw \| diff to current
2019-07-26	Stephen Rothwell	change some style	blob \| commitdiff \| raw \| diff to current
2019-07-26	Stephen Rothwell	do_merge: shellcheck cleanups	blob \| commitdiff \| raw \| diff to current
2019-07-26	Stephen Rothwell	do_merge: switch to using getopts	blob \| commitdiff \| raw \| diff to current
2019-07-26	Stephen Rothwell	do_merge: we have had no rebasing trees for some time	blob \| commitdiff \| raw \| diff to current
2019-07-24	Stephen Rothwell	abstract out check_unmerged files	blob \| commitdiff \| raw \| diff to current
2018-11-26	Stephen Rothwell	consolidate the notifications into a single user suppli...	blob \| commitdiff \| raw \| diff to current
2018-11-18	Stephen Rothwell	tidy up some awk invocations	blob \| commitdiff \| raw \| diff to current
2018-06-06	Stephen Rothwell	do_merge: don't reset the branch stuff before checking...	blob \| commitdiff \| raw \| diff to current
2018-06-01	Stephen Rothwell	set branches based on "branch" points in the control...	blob \| commitdiff \| raw \| diff to current
2016-05-26	Stephen Rothwell	first pass at capturing newly introduced warnings	blob \| commitdiff \| raw \| diff to current
2016-02-09	Stephen Rothwell	start of shellcheck fixes	blob \| commitdiff \| raw \| diff to current
2015-09-25	Stephen Rothwell	do_merge: add pre-build actions	blob \| commitdiff \| raw \| diff to current
2015-09-14	Stephen Rothwell	do_merge: deref possible tags before saving the SHA1s	blob \| commitdiff \| raw \| diff to current
2015-08-26	Stephen Rothwell	cope with doing the merges and build on the same machine	blob \| commitdiff \| raw \| diff to current
2015-08-17	Stephen Rothwell	do_merge: output the date in mail like format	blob \| commitdiff \| raw \| diff to current
2015-06-20	Stephen Rothwell	Merge commit '6fcb1ac2ddc2'	blob \| commitdiff \| raw \| diff to current
2015-06-19	Michael Ellerman	do_merge: Print if fixes exist when merge fails	blob \| commitdiff \| raw \| diff to current
2015-06-19	Michael Ellerman	do_merge: Add notifications	blob \| commitdiff \| raw \| diff to current
2015-06-19	Michael Ellerman	do_merge: Pause when the commit fails	blob \| commitdiff \| raw \| diff to current
2015-06-11	Stephen Rothwell	do_merge: sprinkle notify-send's around to help the...	blob \| commitdiff \| raw \| diff to current
2015-06-04	Stephen Rothwell	automate deleting of files	blob \| commitdiff \| raw \| diff to current
2014-05-26	Stephen Rothwell	do_merge: use rev-parse instead of show-ref --hash	blob \| commitdiff \| raw \| diff to current
2014-05-26	Stephen Rothwell	do_merge: allow for pre merge actions	blob \| commitdiff \| raw \| diff to current
2014-05-15	Stephen Rothwell	do_merge: always do the commit after a manual fixup	blob \| commitdiff \| raw \| diff to current
2014-03-04	Stephen Rothwell	do_merge: don;t commit anything after an empty fixup	blob \| commitdiff \| raw \| diff to current
2013-10-30	Stephen Rothwell	do_merge: don't use --no-ff for merges	blob \| commitdiff \| raw \| diff to current
2013-06-26	Stephen Rothwell	do_merge: make sure we generate a merge commit for...	blob \| commitdiff \| raw \| diff to current
2013-06-20	Stephen Rothwell	remove references to (unused) pre-{merge,build} directories	blob \| commitdiff \| raw \| diff to current
2013-05-21	Stephen Rothwell	add the control file to common.sh	blob \| commitdiff \| raw \| diff to current
2013-05-20	Stephen Rothwell	make some stuff common	blob \| commitdiff \| raw \| diff to current
2013-05-20	Stephen Rothwell	use the local do_build script	blob \| commitdiff \| raw \| diff to current
2013-04-16	Stephen Rothwell	the control files has moved to ../etc, so use it from...	blob \| commitdiff \| raw \| diff to current
2013-03-05	Stephen Rothwell	propogate NEXT_BUILD_HOST/DIR everywhere	blob \| commitdiff \| raw \| diff to current
2013-03-04	Stephen Rothwell	remove the use of refs/next	blob \| commitdiff \| raw \| diff to current
2012-12-18	Stephen Rothwell	do_merge: print the correct head of the scsi-post-merge...	blob \| commitdiff \| raw \| diff to current
2012-11-30	Stephen Rothwell	use dirname of $0 instead of explicit ../tools	blob \| commitdiff \| raw \| diff to current
2012-11-29	Stephen Rothwell	various updates	blob \| commitdiff \| raw \| diff to current
2012-01-04	Stephen Rothwell	various updates	blob \| commitdiff \| raw \| diff to current
2011-11-03	Stephen Rothwell	do_merge: many updates	blob \| commitdiff \| raw \| diff to current
2010-02-02	Stephen Rothwell	do_merge: updates	blob \| commitdiff \| raw \| diff to current
2009-04-16	Stephen Rothwell	suppress some more unneeded builds	blob \| commitdiff \| raw \| diff to current
2009-01-20	Stephen Rothwell	allow for restarting the merge from not the first tree	blob \| commitdiff \| raw \| diff to current
2008-11-19	Stephen Rothwell	allow for optional building after merging a tree	blob \| commitdiff \| raw \| diff to current
2008-06-27	Stephen Rothwell	various fixes	blob \| commitdiff \| raw \| diff to current
2008-03-13	Stephen Rothwell	typo	blob \| commitdiff \| raw \| diff to current
2008-03-12	Stephen Rothwell	lots of updates	blob \| commitdiff \| raw \| diff to current
2008-02-13	Stephen Rothwell	Initial commit	blob \| commitdiff \| raw \| diff to current

The scripts used to build linux-next

RSS Atom