Ensure update is a fast-forward

This commit is contained in:
Josh Hagins
2015-06-30 11:57:55 -04:00
parent b9376c9a7f
commit ff45670e97

View File

@@ -43,7 +43,7 @@ verify_repo() {
update_repo() {
info "Updating $1..."
verify_repo "$1" &&
( cd "${repo}" && git pull "${REMOTE}" "${BRANCH}" )
( cd "${repo}" && git pull --no-rebase --ff "${REMOTE}" "${BRANCH}" )
}
info() {