summaryrefslogtreecommitdiff
path: root/utils/release/merge.sh
AgeCommit message (Expand)Author
2016-11-11Print correct directory in merge script.Richard Trieu
2016-07-18Revert r273099 "If the revision number starts with r, drop it. It will get ad...Hans Wennborg
2016-06-18If the revision number starts with r, drop it. It will get added backJoerg Sonnenberger
2016-06-01Update usage(), make sure srcdir is really empty.Joerg Sonnenberger
2016-05-29Make it easier to process merges in a normal buildable directory tree byJoerg Sonnenberger
2016-01-13Remove bashism from merge.sh: POSIX sh does not have the `function`Dimitry Andric
2015-08-04Add a -revert option to utils/release/merge.shHans Wennborg
2015-01-13Release merge script: don't actually commit the mergeHans Wennborg
2011-10-16Update the tree before applying patch.Bill Wendling
2011-10-16Add a script that helps merge changes into a release branch.Bill Wendling