#!/usr/bin/env bash
#
# Pull and merge changes from a branch to the local repository.
# Copyright (c) Petr Baudis, 2005
#
# Takes the branch name as an argument, defaulting to 'origin'.
#
# If local changes conflict with those of the branch updated from the
# merge will be blocked.

USAGE="cg-update [BRANCH_NAME]"

. ${COGITO_LIB}cg-Xlib

name=$1
[ "$name" ] || { [ -s $_git/refs/heads/origin ] && name=origin; }
[ "$name" ] || die "where to update from?"

cg-pull $name || exit 1
echo
echo "Applying changes..."
cg-merge $name
