Urgent Git problem updating OF15x
I am having some trouble updating OF15 to OF 15x!
When I follow the instruct on the opencfd website
git clone http://repo.or.cz/r/OpenFOAM-1.5.x.git
but the following instruction
git pull http://repo.or.cz/r/OpenFOAM-1.5.x.git
doesn't (please see below!)
Any git expert out there??:-)
thomas@wkstation:~/OpenFOAM/OpenFOAM-1.5.x> git pull http://repo.or.cz/r/OpenFOAM-1.5.x.git
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.
If you often merge with the same branch, you may want to
configure the following variables in your configuration
branch.master.remote = <nickname>
branch.master.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>
See git-config(1) for details.
|All times are GMT -4. The time now is 04:30.|