From 5ef184443cf40200caf9df5495717c991d5ded7c Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 24 Nov 2013 18:15:50 +0100 Subject: Remove force-head script This is now done by ./update --master --- README.rst | 2 +- force-head | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 force-head diff --git a/README.rst b/README.rst index 30da11f..1cd1536 100644 --- a/README.rst +++ b/README.rst @@ -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 ; ) - -- cgit v1.2.3