I think my question is somewhat similar to CaptainPicard's but dissimilar enough that I feel compelled to ask so here goes. I have an old SVN repository with around 7500 revisions and part of those 7500 revisions are some pretty large .fla files. And these .fla files exist in a number of the branches which have been created. As a result...
I have a Git repository (originally CVS, then SVN, now Git) containing a Rails project that has been deployed on Linux for a while now. Everything seems to run fine. Now that I've converted to git, I see that many of my files in the repository contain CRLF line endings. I'd love for it to all be consistent (LF), but not at the expense...
I thought I remembered reading somewhere a way to do this, but I can't find it. I'm working locally, on a local branch even, and I'm checking in as needed, or daily or whatever. When I get the code to the point where I want to push it to the main repository, is there a way to just push the file as is, and not push all of the history?...
I "accidentally" pushed a commit to github. Is it possible to remove this commit? I want to revert my github repository as it was before this commit. ...
I'm using git on a new project that has two parallel -- but currently experimental -- development branches: master: import of existing codebase plus a few mods that I'm generally sure of exp1: experimental branch #1 exp2: experimental branch #2 exp1 and exp2 represent two very different architectural approaches. Until I get further...
While related questions have been asked before I would like to see an idea about how interoperability between two source control management (SCM) systems can be done. For example we could consider any SCM out there (Mercurial, Git, SVN, CVS, Perforce, ClearCase ...). Mainly I'm interested if ClearCase can be used along with SVN or Git/...
I need to to tell which revision/SHA1 of a file was associated with one or more tags. In CVS it is possible to get an output similar to to this: File: abc.txt Rev: 1.0 Tags: R1_0, R1_1 Rev: 1.1 Tags: R1_2 How do you get a tag history for a file with git? Edit: I frequently use this function to tell which revision o...
The answers to this question describe a way to amend previous commit messages that haven't yet been pushed upstream. The new messages inherit the timestamps of the original commits. This seems logical, but is there a way to also re-set the times? ...
I'm looking for a nice, Mac OS X-like, client for Git. As an example, I use Versions for Subversion and it's exactly what I'd like to purchase for Git access. Suggestions? Versions link ...
Is there any way to use a git repository with the built in SCM functions of Xcode? ...
There are so many ways to skin a cat, can anyone improve on this? ...
I'm struggling to understand something about GIT. We've got a repository with a number of branches in it. I can fetch a local copy of one of those branches (git checkout -b ...), make some changes, then push them back. If I fail to tag the end of the branch, however, how do other users get the head of the branch? WHen they use git check...
I want to modify a commit message deeper in history. And I've pushed many new commits. How do I chnage the commit message? Is it possible? Thanks! ...
I've been using git now for a couple months on a project with one other developer. I have several years of experience with svn, so I guess I bring a lot of baggage to the relationship. I have heard that git is excellent for branching and merging, and so far, I just don't see it. Sure, branching is dead simple, but when I try to merge,...
Here is my problem: I used Subversion for some time, until I switched to Git. Some more time elapsed. There was no import of the history from Subversion to Git. It was a strict checkout, delete of the .svn dirs, then git init. Not a smart move. Now, thousands of git commits later, I find a backup of the Subversion repo made at the t...
I've heard that many of the distributed VCSs (git, mercurial, etc) are better at merging than traditional ones like Subversion. What does this mean? What sort of things do they do to make merging better? Could those things be done in a traditional VCS? Bonus question: does SVN 1.5's merge-tracking level the playing field at all? ...
Hi all, I've pushed many commits successfully, but I got an error message "error: failed to push some refs" every git-push. I have no idea about this message. Could someone tell me what happened? How do I fix this issue? Thanks! The following is the log of my git-push. [jinuu@foonlean source]$ git push [email protected]'s passwor...
I've added a file to the 'index' with: git add myfile.java How do I find out the SHA1 of this file? ...
I added a file to the index with: git add somefile.txt I then got the SHA1 for this file with: git hash-object somefile.txt I now have a SHA1 and I would like to retrieve the filename of the object in the index using the SHA1. git show 5a5bf28dcd7944991944cc5076c7525439830122 This command returns the file contents but not the na...
If you are in a corporate setting with many people working on a particular application, is it going against the grain of a distributed version control system to have an official central repository? Sometimes I struggle to understand the concept of a distributed version control system such as GIT in a corporate environment. If you didn'...