git

plink Password Over and Over

Hi Guys, I am using plink as part of GIT setup and I have setup my remote keys correctly and can connect via Putty. However, when I attempt to run msysgit and TortiseGit to clone a git directly - enter the path via c:\Program Files (x86)\puTTY\plink.exe I get a window box asking for a password. Now I have set a pword on my rsa...

Better way to use git add?

As a git noob trying it out on a Rails project, I am wondering if it is bad practice to do git add . (add current directory) before every commit. The intro tutorials I have seen show adding the current directory initially, then using git add new_file to add files after that. If I'm adding a bunch of files from a bunch of different dire...

Access GIT via Cygwin but not via Git Bash ?

Hello I have installed msysgit - and I am trying to get it working. When I run a cygwin bash terminal - I can access my ssh via ssh user@host When I try the same via a Git Bash git ls-remote user@host/path/to/git I simply get a fatal: the remote end hung up Any ideas what to do ? ...

Git checkout/pull doesn't remove directories?

Okay, I'm new to git, coming from SVN. I've got my repo @ github. Last night, did some work at home and pushed it to github. It involved some deleting of files and directories. Now I'm on my work box, which had a copy of the code before deleting the files and directories. I issued the following: git remote update git checkout HEAD git...

How can I get git and copSSH to look in the correct directory for keys?

I just installed copSSH for Windows. When I boot it up I get a directory C:\copSSH\home\Nick\.ssh which has my pub and private key it. When I access this directory via a Cygwin bash window using ssh user@host I get happily logged in. However, when I open a git bash window with git clone ssh://user@host it tries to access ...

git: not uptodate

I am new to git. I have forked another repository awhile back. I wanted a fresh start so I grabbed my private clone and then added a remote for the upstream repository. I can't pull from the repository because it says some files are not uptodate. I don't care about these files, I want everything from the upstream remote. Is there a way I...

Is TortoiseGit ready for prime time yet?

I'm a big fan of the simplicity of TortoiseSVN. I also am interested in digging into git, and think it would make a good fit for an upcoming project. However, a strictly command-line based app can be a little intimidating. I've followed the TortoiseGit project for a little while, and it looks like they are past 1.0. Is there anyone usin...

Getting git to follow symlinks (again)

Somebody already asked how you can get git to follow symlinks. There was an answer for a symlinked directory, but not for a symlinked file. It was also over a year ago. Question: how do you get git to follow a symlink and add the file it refers to? Here is the old question: http://stackoverflow.com/questions/86402/how-can-i-get-git-to-...

How can I checkout out the HEAD version of my remote/tracking branch

Hi, In git, how can I checkout out the HEAD version of my remote/tracking branch? Basically, I want to do a 'svn checkout ' in git. I think the closest thing I find is 'git fetch', but from the man page, I don't know how to checkout 1 particular file using that? ...

Is it possible to store only a checksum of a large file in git?

I'm a bioinformatician currently extracting normal-sized sequences from genomic files. Some genomic files are large enough that I don't want to put them into the main git repository, whereas I'm putting the extracted sequences into git. Is it possible to tell git "Here's a large file - don't store the whole file, just take its checksum,...

How to take the version in remote branch and forget the change I make in my working directory

I made changes in my working directory and did a 'git commit' And then I do a 'git pull'. Git tries to pull changes in the remote tracking branch and automatically merge it for me. But there are some files with conflict. So How can I just take the version in the remote branch and forget the change I made in a particular file? I try t...

JIRA code validation commit hook for 'git'

Does anyone have a git commit hook I can use that will ensure a JIRA issue number appears in the checkin message? I've got no experience driving JIRA from a git commit hook so any help would be appreciated -- working source even more so! ...

Git multiple release branches, building automated incremental revision numbers

I've been using git for some time now and understand how commits work, tags, etc. I really like the ability to see incremented revision numbers after using git tag -a 1.0.0, but there's issues with that: It tags everything, so any future work that shares that tag in history will reflect the tag, unless re-tagged. It's a bit more work t...

Git-svn gets confused over a tag with the same name as a previously deleted one.

This is the scenario: I copied my subversion trunk into a tag "A". I then ran 'git svn fetch' from my local repository which found the branch point and added it as the remote branch 'svn/tags/A'. Later I removed tag "A" from subversion, and again ran 'git svn fetch'. I did a 'git branch -rd svn/tags/A' to remove the dangling remote bra...

Migration from Subversion to Git in a company setting?

Is there anyone out there whose company has migrated from a medium to large Subversion repository to Git? If so: What were the pitfalls you had to overcome? How easy was it for your developers to make the switch and learn Git? Is it a good idea for companies to migrate at this point or should they wait for Git to become more mature (e....

A git hook for whenever I change branches?

So here's an interesting situation when using git and python, and I'm sure it happens for other situations as well. Let's say I make a git repo with a folder /foo/. In that folder I put /foo/program.py. I run program.py and program.pyc is created. I have *.pyc in the .gitignore file, so git doesn't track it. Now let's say I make anoth...

How do I remove a single file from the staging area of Git but not remove it from the index or undo the changes to the file itself?

Situation: I have a Git repository with files already in the index. I make changes to several files, open Git and add these files to my staging area with "git add ." Question: How do I remove one of those files from the staging area but not remove it from the index or undo the changes to the file itself? ...

git checkout revision of a file in git gui

Is there a good way to checkout revisions of a specific file in git gui like an add tool or something? Tried adding a new tool as: git checkout $REVISION $FILENAME But it only allows branch revisions out, not a specific commit. Is there a particular var I coud use to do that? ...

How to deal with this git error

I am getting this error in my git repository: 22:09:15 $ git status # On branch master error: Could not read 8124cc15c63be92d534e4cdfa33c38d54deee122 error: unable to read tree object HEAD nothing to commit (working directory clean) A Google search for error: unable to read tree object HEAD doesn't result in much help, this error seem...

Preventing a complete rebuild using branches with GIT and Visual Studio 2005

One of the problem I faced when using branches in GIT was that it was very easy when switching branches to cause visual studio 2005 to cause a complete rebuild of the source because of the time/date being changed when switching branches. My typical layout is this. svn/remote master test When switch between either the test and the maste...