Re: [git-users] git clone
On Thu, Aug 9, 2012 at 11:17 AM, THUFIR HAWAT wrote: > > > On Wednesday, 8 August 2012 20:55:31 UTC-7, Aneesh wrote: >> >> [..] >> >> > and a few variants, I can't find the syntax in "git help clone" >> >> 'git clone -b ...' basically means to checkout >> (in a non-bare repository), instead of whatever was being >> pointed to by HEAD in the cloned repository. This does NOT mean that >> git will get only the branch and not others... >> >> After cloning, just to 'git branch -r' to see a list of all >> remote-tracking branches - i.e. all branches that existed in the >> cloned repo when you had cloned it... >> >> Hope that helps.. >> >> regards, >> Aneesh > > > hmm, so after you clone a repo, what's the effective difference between > "checkout foo" and "checkout -b foo"? > > git help doesn't help me with that: > >If -b is given, a new branch is created as if git-branch(1) were > called and >then checked out; in this case you can use the --track or > --no-track options, >which will be passed to git branch. As a convenience, --track > without -b >implies branch creation; see the description of --track below. > > > if branch "foo" doesn't exist, the checkout will fail? You can't > accidentally get name collisions between local foo and remote foo? > > This link should help - has basically the same query.. http://stackoverflow.com/questions/67699/how-do-i-clone-all-remote-branches-with-git regards, Aneesh -- 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-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] force merge to fix conflicts?
I get conflicts when trying to merge: https://gist.github.com/3301009 What I want to do is to take commit x to branch 4 and put it "ontop"(?) of commit y on branch "master." Is that not a merge? What does it matter when there's a conflict, isn't that the very meaning of merge, that you are saying, yes, these two things are different, replace "this one" with "that one"? When would have a merge *without* conflicts, and why? thanks, Thufir -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/z-vPQTLRz4kJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] git clone
On Wednesday, 8 August 2012 20:55:31 UTC-7, Aneesh wrote: > > [..] > > and a few variants, I can't find the syntax in "git help clone" > > 'git clone -b ...' basically means to checkout > (in a non-bare repository), instead of whatever was being > pointed to by HEAD in the cloned repository. This does NOT mean that > git will get only the branch and not others... > > After cloning, just to 'git branch -r' to see a list of all > remote-tracking branches - i.e. all branches that existed in the > cloned repo when you had cloned it... > > Hope that helps.. > > regards, > Aneesh > hmm, so after you clone a repo, what's the effective difference between "checkout foo" and "checkout -b foo"? git help doesn't help me with that: If -b is given, a new branch is created as if git-branch(1) were called and then checked out; in this case you can use the --track or --no-track options, which will be passed to git branch. As a convenience, --track without -b implies branch creation; see the description of --track below. if branch "foo" doesn't exist, the checkout will fail? You can't accidentally get name collisions between local foo and remote foo? thanks, Thufir -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/I5CkKQPtwBYJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] git clone
Hi Thufir.. On Thu, Aug 9, 2012 at 9:15 AM, THUFIR HAWAT wrote: > > There's no syntax for cloning all branches for a repo? > >From what I understand, cloning a git repo basically gets you the entire git repository - which means that you get all branches.. > How do you at least clone multiple branches? I tried: > > thufir@dur:~/NetBeansProjects$ > thufir@dur:~/NetBeansProjects$ git clone -b master -b > 4.GUI_loading_messages_slowly g...@github.com:THUFIR/USENET.git > Cloning into USENET... > remote: Counting objects: 3782, done. > remote: Compressing objects: 100% (1274/1274), done. > remote: Total 3782 (delta 1647), reused 3613 (delta 1478) > Receiving objects: 100% (3782/3782), 388.55 KiB | 79 KiB/s, done. > Resolving deltas: 100% (1647/1647), done. > thufir@dur:~/NetBeansProjects$ > thufir@dur:~/NetBeansProjects$ cd USENET > thufir@dur:~/NetBeansProjects/USENET$ git branch > * 4.GUI_loading_messages_slowly > thufir@dur:~/NetBeansProjects/USENET$ > > > and a few variants, I can't find the syntax in "git help clone" 'git clone -b ...' basically means to checkout (in a non-bare repository), instead of whatever was being pointed to by HEAD in the cloned repository. This does NOT mean that git will get only the branch and not others... After cloning, just to 'git branch -r' to see a list of all remote-tracking branches - i.e. all branches that existed in the cloned repo when you had cloned it... Hope that helps.. regards, Aneesh -- 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-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] git clone
There's no syntax for cloning all branches for a repo? How do you at least clone multiple branches? I tried: thufir@dur:~/NetBeansProjects$ thufir@dur:~/NetBeansProjects$ git clone -b master -b 4.GUI_loading_messages_slowly g...@github.com:THUFIR/USENET.git Cloning into USENET... remote: Counting objects: 3782, done. remote: Compressing objects: 100% (1274/1274), done. remote: Total 3782 (delta 1647), reused 3613 (delta 1478) Receiving objects: 100% (3782/3782), 388.55 KiB | 79 KiB/s, done. Resolving deltas: 100% (1647/1647), done. thufir@dur:~/NetBeansProjects$ thufir@dur:~/NetBeansProjects$ cd USENET thufir@dur:~/NetBeansProjects/USENET$ git branch * 4.GUI_loading_messages_slowly thufir@dur:~/NetBeansProjects/USENET$ and a few variants, I can't find the syntax in "git help clone" thanks, Thufir -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/EMdHj3yenj8J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Convert branch into a tag
On Monday, 6 August 2012 01:56:51 UTC+1, Trans wrote: > > > Oh, so the branch and tag names won't conflict? > > No. Branches live in refs/heads/ while tags live in refs/tags/. If you have a branch and tag with the same name, some git commands will require you to disambiguate (for example `git merge ` will be ambiguous -- disambiguation is achieved using e.g. `git merge refs/heads/`). However this is not the case for `git branch -d`. Hope that makes it clearer, Antony -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/_GTPT5n5isIJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Beginner stuck in a commit
On Tuesday, 7 August 2012 07:48:02 UTC+1, Philip Oakley wrote: > > > I'd suggest that you set up your configuration to use Notepad++ (a lovely > open source editor). There is a Stackoverflow page with details. > Set up your .gitconfig (mine's in C:\Documents and > Settings\Philip\.gitconfig) as > > [core] > editor = 'C:\\Program Files\\Notepad++\\notepad++.exe' -multiInst > -notabbar -nosession -noplugin > If you're not confident setting this up, Github wrote a little program, available as a .exe from [1], which sets notepad as the default git editor. Antony [1]: https://github.com/blog/975-gitpad-write-your-commits-in-notepad -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/QJicouvpWxwJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] git clone fails with "unable to overwrite old ref-pack file"
On Tue, 7 Aug 2012 18:24:48 -0700 (PDT) Lisa Zorn wrote: (CC'ing the msysgit mailing list, I suspect the discussion does really belong there, so possibly please cull git-users from the CC list when replying.) > I have been using git for years and have not run into this problem > before. I tried to git clone a repo that's on a local drive, and I > get this error: dir1\dir2>git clone -b master Y:\git_src > Cloning into 'Muni_GenevaBRT_HuntersPtToCandlestickInterchangeOnly'... > done. > fatal: unable to overwrite old ref-pack file: Permission denied > fatal: The remote end hung up unexpectedly > > However, when I run it in another directory (not a subdir of dir1), > it works fine. But it's repeatable; if I run it from dir1\dirX it > happens again. > I am using the stable version of git, and I'm on windows. What's > going on with the "old ref-pack file"? Are you sure that the combination of "dir1\dir2" and that "Muni_..." thing does not exceed the limit of 260 or so characters? This has been discussed recently: [1], [2]. I would try to debug this situation by monitoring which files are acce ssed by Git tools using Process Monitor [3] (ex. FileMon) -- you could filter its output by failed attempts to create/open files. 1. https://github.com/msysgit/msysgit/issues/52 2. http://thread.gmane.org/gmane.comp.version-control.msysgit/14572 3. http://technet.microsoft.com/en-us/sysinternals/bb896645 -- 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-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
