Added a --force flag to guarantee a successful pull.

This commit is contained in:
Michael Tremer
2008-10-02 16:33:19 +00:00
parent 824a0f689e
commit 533bebcc42
2 changed files with 3 additions and 1 deletions

View File

@@ -905,6 +905,8 @@ othersrc)
git)
case "$2" in
update|up)
## REMOVES ALL UNCOMMITTED CHANGES!
[ "$3" == "--force" ] && git checkout -f
git pull
;;
commit|ci)

View File

@@ -496,7 +496,7 @@ batch_script() {
$0 clean
evaluate 1
$0 git update
$0 git update --force
evaluate 1 mail_me UPDATE
echo "### EXPORT SOURCES"