From: Michael S. <scr...@ya...> - 2012-04-07 07:55:27
|
Hi didn't fly for while but now I wanted to try Rembrandt shadows. michael@ubuntu:/media/DATA/FGFS/install/fgfs/fgdata$ git pull 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 specify which branch you want to use on the command line and try again (e.g. 'git pull <repository> <refspec>'). See git-pull(1) for details. If you often merge with the same branch, you may want to use something like the following in your configuration file: [branch "master"] remote = <nickname> merge = <remote-ref> [remote "<nickname>"] url = <url> fetch = <refspec> See git-config(1) for details. michael@ubuntu:/media/DATA/FGFS/install/fgfs/fgdata$ What branch etc.? Also the command: sh download_and_compile.sh DATA UPDATE returns the same. Thanks Michael |