Firebird News

Monday, August 25, 2008

git pull with master branch

I wanted to sync with my master branch from main repository
I have added some files in the weekend , and got this message from git

cd /opt/nginx/html/firetube

$ 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
name which branch you want to merge on the command line and
try again (e.g. 'git pull ').
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 =
branch.master.merge =
remote..url =
remote..fetch =

See git-config(1) for details.

$ git pull master
* branch master -> FETCH_HEAD
Updating 1e85082..7a3c469
Fast forward
app/config/sql/firetube.sql | 51 ++++++++++++++++++++++++++++++++++
app/controllers/posts_controller.php | 14 +++++++--
app/models/post.php | 13 +++++++-
app/views/posts/add.ctp | 7 ++++
app/views/posts/index.ctp | 1 +
5 files changed, 81 insertions(+), 5 deletions(-)
create mode 100644 app/config/sql/firetube.sql
create mode 100644 app/views/posts/add.ctp

No comments: