diff options
author | wm4 <wm4@nowhere> | 2013-04-13 20:16:36 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-04-13 20:16:36 +0200 |
commit | 47474ed03bc2d596a99dfdd49d489ce109d90d6e (patch) | |
tree | 96ed5cbf1e49323faf46ba0ea373757ce3f436c0 | |
parent | 94e4cc8619ccf36e28543b6f4428b93bc758c4c3 (diff) | |
download | mpv-build-47474ed03bc2d596a99dfdd49d489ce109d90d6e.tar.bz2 mpv-build-47474ed03bc2d596a99dfdd49d489ce109d90d6e.tar.xz |
Add force-head script, which throws away everything and uses master
The script is intentionally not marked +x. The hasbang is just for
making clear that it's a shell script.
-rw-r--r-- | README.rst | 15 | ||||
-rw-r--r-- | force-head | 11 |
2 files changed, 26 insertions, 0 deletions
@@ -97,6 +97,21 @@ You can build a full mpv Debian package with the following command: The .deb file will be created in the parent directory. (4 is the number of jobs running in parallel - you can change it.) +Forcing master versions of all parts +==================================== + +The following command can be used to delete all local changes, and to checkout +the current master versions for all parts (libass, ffmpeg, mpv, as well as +mpv-build itself): + + sh ./force-head + +All local modifications are overwritten (including changes to the scripts), +and git master versions are checked out. Breakages/bugs are to be expected, +because these are untested bleeding-edge development versions of the code. + +Use on your own risk. + Contact ======= diff --git a/force-head b/force-head new file mode 100644 index 0000000..fa59004 --- /dev/null +++ b/force-head @@ -0,0 +1,11 @@ +#!/bin/sh + +update_master() { + git fetch && git checkout -f origin/master +} + +update_master +( cd libass && update_master ; ) +( cd ffmpeg && update_master ; ) +( cd mpv && update_master ; ) + |