* git-pull can't be used without URL - Has worked before
@ 2007-03-16 10:24 Pelle Svensson
2007-03-16 11:51 ` Paolo Bonzini
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Pelle Svensson @ 2007-03-16 10:24 UTC (permalink / raw
To: git
Hi,
Did a setup of a new git-kernel, but this time git-pull can't be used without
full URL. What should I do.
Setup done this time
=================
[]$ git-clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[]$ git-checkout -b my-brach v2.6.21-rc3;
...
[]$ git-pull
Warning: No merge candidate found because value of config option
"branch.my-project.merge" dose not match any remote
branch fetched.
Tried with success
==============
[]$ git-pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Then again
=========
[]$ git-pull
Warning: No merge candidate found because value of config option
"branch.my-project.merge" dose not match any remote
branch fetched.
I don't have .../.git/remotes directory in this setup??
/Pelle
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git-pull can't be used without URL - Has worked before
2007-03-16 10:24 git-pull can't be used without URL - Has worked before Pelle Svensson
@ 2007-03-16 11:51 ` Paolo Bonzini
2007-03-16 11:52 ` Paolo Bonzini
2007-03-16 22:48 ` Matthias Lederhofer
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2007-03-16 11:51 UTC (permalink / raw
To: Pelle Svensson; +Cc: git
> I don't have .../.git/remotes directory in this setup??
For v1.5.0, git-clone sets up a remote repository so that
you can look at what's going on remotely like this:
git log origin/next
To create your branch, you have to do something like
git-checkout -b my-branch origin/next
git-config add branch.my-branch.remote origin
git-config add branch.my-branch.merge refs/heads/next
Note that the branch in the last command is the remote branch
name not the local name.
With the current git "master" branch, you are able to do
something like
git-checkout --track -b my-branch origin/next
and git-pull (with no arguments) will automatically pull from
whatever branch you specified upon branch creation. --track
also works with local branches, so you can have your topic
branches track the tip of your current development branch,
for example.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git-pull can't be used without URL - Has worked before
2007-03-16 10:24 git-pull can't be used without URL - Has worked before Pelle Svensson
2007-03-16 11:51 ` Paolo Bonzini
@ 2007-03-16 11:52 ` Paolo Bonzini
2007-03-16 22:48 ` Matthias Lederhofer
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2007-03-16 11:52 UTC (permalink / raw
To: Pelle Svensson; +Cc: git
> I don't have .../.git/remotes directory in this setup??
For v1.5.0, git-clone sets up a remote repository so that
you can look at what's going on remotely like this:
git log origin/next
To create your branch, you have to do something like
git-checkout -b my-branch origin/next
git-config add branch.my-branch.remote origin
git-config add branch.my-branch.merge refs/heads/next
Note that the branch in the last command is the remote branch
name not the local name.
<shameless-advertisement-of-my-patches>
With the current git "master" branch, you are able to do
something like
git-checkout --track -b my-branch origin/next
and git-pull (with no arguments) will automatically pull from
whatever branch you specified upon branch creation. --track
also works with local branches, so you can have your topic
branches track the tip of your current development branch,
for example.
</shameless-advertisement-of-my-patches>
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git-pull can't be used without URL - Has worked before
2007-03-16 10:24 git-pull can't be used without URL - Has worked before Pelle Svensson
2007-03-16 11:51 ` Paolo Bonzini
2007-03-16 11:52 ` Paolo Bonzini
@ 2007-03-16 22:48 ` Matthias Lederhofer
2 siblings, 0 replies; 4+ messages in thread
From: Matthias Lederhofer @ 2007-03-16 22:48 UTC (permalink / raw
To: Pelle Svensson; +Cc: git
Pelle Svensson <pelle2004@gmail.com> wrote:
> Did a setup of a new git-kernel, but this time git-pull can't be used
> without
> full URL. What should I do.
git pull [<remote>] uses the first branch of 'remote' if there is no
special branch.name.{merge,remote} configuration. But git clone will
setup remote.origin.fetch = +refs/heads/*:refs/remotes/origin/* which
uses wildcards and isn't used as 'first branch'. You can add another
remote.origin.fetch line before this one in .git/config with
fetch = +refs/heads/master:refs/remotes/origin/master
which worked for me.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-03-16 22:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-16 10:24 git-pull can't be used without URL - Has worked before Pelle Svensson
2007-03-16 11:51 ` Paolo Bonzini
2007-03-16 11:52 ` Paolo Bonzini
2007-03-16 22:48 ` Matthias Lederhofer
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).