[git-users] Fetch detail

2010-02-12 Thread Pito
Does it make a difference what I have checked out when I do a git fetch? (note: NOT a git pull). Or does it just bring down the complete tree of commits, no matter what branch they belong to? Thanks, Pito -- You received this message because you are subscribed to the Google Groups "Git

[git-users] Meaning of 'HEAD' vs. branch master

2010-03-22 Thread Pito Salas
Hi all, What's the exact meaning of 'HEAD' ? Is it a tag or a branch, and what does it do/mean? When does one use it? And what might it mean when my remote repo says that there are two 'HEAD's, on different branches? Thanks!! Pito -- You received this message because

Re: [git-users] Meaning of 'HEAD' vs. branch master

2010-03-22 Thread Pito Salas
equently in Git documentation. Currently "active head" means HEAD for the current checked out branch, yes? Also, then, what exactly does someone get when they do a "git clone" on a remote repo that has multiple branches and hence multiple heads? Thanks! Pito -- You received this

Re: [git-users] Meaning of 'HEAD' vs. branch master

2010-03-22 Thread Pito Salas
So, there's one HEAD per repository, not one per branch, correct? -- Pito On Mon, Mar 22, 2010 at 10:44 AM, Jacob Helwig wrote: > On Mon, Mar 22, 2010 at 07:22, Pito Salas wrote: >> Dilip >> >> Thanks, that clears up a lot. >> >>> >>> - Note

[git-users] Remote vs. local branch

2010-03-25 Thread Pito Salas
rigin/release-001  remotes/origin/singleballotimp  remotes/origin/wicked_pdf  remotes/origin/ymlsupport $ What does it mean when a branch is on a remote but not local? How do I get it local so that I can check it out? Thanks!! Pito -- You received this message because you are subscribed to the

Re: [git-users] Remote vs. local branch

2010-03-25 Thread Pito Salas
Thanks! So even though the branch is in the local repo, I can't use the files locally without creating a local tracking branch. And git checkout as well as git branch only work locally, always. Yes? - Pito On Thu, Mar 25, 2010 at 4:43 PM, Paul Beckingham wrote: > The remote/origin/ym

[git-users] Small mystery

2010-04-07 Thread Pito Salas
remotes/origin/ymlsupport Anyone see what's messing me up? Probably something stupid... Thanks! Pito -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsu

Re: [git-users] Small mystery

2010-04-07 Thread Pito Salas
/jquery" will create a local jquery branch based off of the > origin/jquery reference. > > -- Wow, thanks. So to clarify: git fetch origin jquery does download the commits but not the branch (labels?) -- Pito -- You received this message because you are subscribed to the

Re: [git-users] Re: Small mystery

2010-04-08 Thread Pito Salas
Thanks everyone, for the explanations. Extremely useful! One final nuance: What then does git fetch do different from git fetch origin ? - Pito On Wed, Apr 7, 2010 at 8:58 PM, Jeffrey wrote: >> A key note in git-fetch(1) is: >> >> > A parameter without a colon is

Re: [git-users] Re: Small mystery

2010-04-09 Thread Pito Salas
Thanks again to everyone for the careful and thoughtful responses. It's an education ! On Thu, Apr 8, 2010 at 9:06 PM, Petr Baudis wrote: > On Wed, Apr 07, 2010 at 05:58:22PM -0700, Jeffrey wrote: >> > A key note in git-fetch(1) is: >> > >> > > A parameter without a colon is equivalent to : when

[git-users] What to do when you get a conflict (rails) of schema.rb

2010-08-25 Thread Pito Salas
y fix the merge conflict, but I am still stuck with ActiveRecord::Schema.define(:version => 20100818220632) do Not clear at all what to do with that. Any suggestion or SOP for this not-uncommon case? -- Pito -- You received this message because you are subscribed to the Google Groups "G

Re: [git-users] What to do when you get a conflict (rails) of schema.rb

2010-08-26 Thread Pito Salas
Hmm. But it's a git-users question. Thanks anyway. On Wed, Aug 25, 2010 at 6:52 PM, Michael P. Soulier wrote: > On 25/08/10 Pito Salas said: > >> Hi all, >> >> This happens from time to time and I am not sure the right solution: >> >> Working on a rails a

Re: [git-users] What to do when you get a conflict (rails) of schema.rb

2010-08-26 Thread Pito Salas
Yeah it's a mystery to me: the question about checking in schema.rb is heavily debated and the rails code itself STRONGLY advises to check it in. But I don't know why because what you say makes perfect sense to me too. -- Pito On Thu, Aug 26, 2010 at 10:40 AM, Donovan Bray wrote