Unified · Split
| @@ -18,6 +18,17 @@ merge(){ # $1=repository, $2=refspec · 17 unmodified lines | |||
| 18 | suceeded="$suceeded $2" | 18 | suceeded="$suceeded $2" |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | error(){ | ||
| 22 | echo $1 | ||
| 23 | exit 1 | ||
| 24 | } | ||
| 25 | |||
| 26 | git diff --exit-code >/dev/null ||\ | ||
| 27 | error "Please commit local changes first" | ||
| 28 | |||
| 29 | git diff --cached --exit-code >/dev/null ||\ | ||
| 30 | error "Please commit local changes first" | ||
| 31 | |||
| 21 | #version="12.34" | 32 | #version="12.34" |
| 22 | 33 | ||
| 23 | merge "https://github.com/michaelni/FFmpeg.git" "libpostproc" | 34 | merge "https://github.com/michaelni/FFmpeg.git" "libpostproc" |