pull doesn't seem to work quite right...

[rogerdpack]

Jeweler does great at creating my repository.
However, is the following expected?

# create gem_conflict_plugin

C:\dev\ruby\gem_conflict_plugin>git b -a
* master

C:\dev\ruby\gem_conflict_plugin>git push origin master
Counting objects: 12, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (12/12), 2.75 KiB, done.
Total 12 (delta 0), reused 0 (delta 0)
To g...@github.com:rdp/gem_conflict_plugin.git
* [new branch] master -> master

C:\dev\ruby\gem_conflict_plugin>git b -a
* master
remotes/origin/master

C:\dev\ruby\gem_conflict_plugin>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 merge 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
configure the following variables in your configuration
file:

branch.master.remote = <nickname>
branch.master.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>

See git-config(1) for details.

[msysgit]

Thanks.
-r

[Josh Nichols]

Take a look at http://caiustheory.com/adding-a-remote-to-existing-git-repo

Personally, I have git globally setup to use the origin remote for pull, and merge from the master. The commands to do so are:

git config --global branch.master.remote origin

git config --global branch.master.merge master

I'm not sure if it would make sense to do this to a newly created repo or not.

- Josh

[rogerdpack]

> Take a look athttp://caiustheory.com/adding-a-remote-to-existing-git-repo

Interesting. I think what happens is if you originally pull from a
master from github [i.e. the "new repository" instructions github
shows you] then it sets this up. Maybe something like that would work
if the --create-repository flag is specified?

-r

[Josh Nichols]

Maybe. But it seems more like a basic kind of git configuration, rather than something jeweler should be handling.

- Josh