From: Richard Hartmann Date: Wed, 7 May 2014 06:39:42 +0000 (+0200) Subject: Merge pull request #129 from tfnico/patch-5 X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/bdd64829b5af03ab21e315a61897ea4e97c1f6d3?ds=inline;hp=--cc Merge pull request #129 from tfnico/patch-5 Suggest shorter form of vcsh pull --- bdd64829b5af03ab21e315a61897ea4e97c1f6d3 diff --cc vcsh index 18cd9e5,6e18e16..31a6019 --- a/vcsh +++ b/vcsh @@@ -159,9 -159,9 +159,9 @@@ clone() error "'$object' exists." && VCSH_CONFLICT=1 done - [ "$VCSH_CONFLICT" = '1' ]) && + [ x"$VCSH_CONFLICT" = x'1' ]) && fatal "will stop after fetching and not try to merge! - Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17 + Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17 git merge origin/master hook post-merge hook post-clone