Re: [git-users] git clone fails with unable to overwrite old ref-pack file

2012-08-08 Thread Konstantin Khomoutov
On Tue, 7 Aug 2012 18:24:48 -0700 (PDT) Lisa Zorn lisa.z...@sfcta.org 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

Re: [git-users] Beginner stuck in a commit

2012-08-08 Thread Antony Male
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

[git-users] Re: Convert branch into a tag

2012-08-08 Thread Antony Male
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

Re: [git-users] git clone all branches

2012-08-08 Thread Aneesh Bhasin
Hi Thufir.. On Thu, Aug 9, 2012 at 9:15 AM, THUFIR HAWAT hawat.thu...@gmail.com 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

Re: [git-users] git clone all branches

2012-08-08 Thread THUFIR HAWAT
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 branchname ...' basically means to checkout branchname (in a non-bare repository), instead of whatever was being pointed to by HEAD in the cloned

[git-users] force merge to fix conflicts?

2012-08-08 Thread THUFIR HAWAT
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