diff options
| author | wm4 <wm4@nowhere> | 2013-11-24 18:15:50 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-29 19:25:16 +0100 |
| commit | 5ef184443cf40200caf9df5495717c991d5ded7c (patch) | |
| tree | a44b5e1b284a97855140a1701554c594bdc61333 | |
| parent | 337541b842a718b1a0e0b5c076eb7f6c2f738259 (diff) | |
| download | mpv-build-5ef184443cf40200caf9df5495717c991d5ded7c.tar.bz2 mpv-build-5ef184443cf40200caf9df5495717c991d5ded7c.tar.xz | |
Remove force-head script
This is now done by ./update --master
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | force-head | 12 |
2 files changed, 1 insertions, 13 deletions
@@ -130,7 +130,7 @@ 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 + ./update --master All local modifications are overwritten (including changes to the scripts), and git master versions are checked out. Breakages/bugs are to be expected, diff --git a/force-head b/force-head deleted file mode 100644 index 4608ea2..0000000 --- a/force-head +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -update_master() { - git fetch && git checkout -f origin/master -} - -update_master -( cd fribidi && update_master ; ) -( cd libass && update_master ; ) -( cd ffmpeg && update_master ; ) -( cd mpv && update_master ; ) - |