How can you show the differences of a file in the last 5 commits to the current uncommitted file by Git-show? I made a change to my file which breaks my code. However, I do not know where the change is. I would like to compare the current uncommitted files to the recent commit (HEAD), to the previous commit (^HEAD) and at least 3 commi...
My company has a large codebase in Surround SCM, which was migrated from SourceSafe a few years ago. We're looking to move to something more suited to our needs, but getting our history out of Surround is proving to be a challenge. Googling for git importers, I found a good tutorial on custom importers. There also appears to be support ...
Hello, I have got the git branch I'm working on to a nice place. So I make a commit with a useful commit message. I then absentmindedly make minor changes to the code that are not work keeping. I now want to changes branches, but git gives me, error: You have local changes to "X"; cannot switch branches. I thought that I could change ...
We previously used many submodules in our main repositories, but to increase the maintainability of our projects we started an experimental branch where we replaced them all with subtrees. This worked good - but now when I'm trying to update one of the subtrees it erroneously merges the update into a completely wrong directory that isn'...
I have to rewrite the history of my repository because it contains some credentials. As I have to amend the root commit I followed the instructions from Git Faq. My problem is though that I have two branches and several tags already in the repository and I'd like that my history rewrite to apply to those too. The repo isn't public yet, s...
I'm trying to use git on a Mac (I'm a Mac newbie.) I obviously have to load my private key. On my Windows machine I just use pageant and msysgit. How do I load my private key into git on the Mac? ...
I have some old branches in my git repository that are no longer under active development. I would like to archive the branches so that they don't show up by default when running git branch -l -r. I don't want to delete them, because I want to keep the history. How can I do this? I know that it's possible to create a ref outside of refs...
I've setup a Hudson continuous intgration server on an Ubuntu 8.04 slice, git version 1.6.4. I am able to have it pull code from a private repo GitHub, but I can't seem to get it to push the tags back after a build. I see the following: # sudo -u hudson git push --tags XML error: syntax error error: Error: no DAV locking support on http...
Can I embed the following bash shell code: for name in $(git diff --name-only $1); do git difftool $1 $name & done directly into the creation of a git alias: git config --global alias.diffall ***my-bash-code-here*** This leads on from my previous question/answer on SO, where I put the code into a .sh file and then aliased to the f...
Hi, I am using 'git' to checkout chromium code by following this document: http://code.google.com/p/chromium/wiki/UsingGit And it said 'Run git pull or whichever command is appropriate to update your checkout. '. But the problem I run into is when I have local changes in my git working directory and then I run 'git pull'. It said som...
I'm tired of subversion, it keeps corrupting its own repository. As I was for a long time curios of git and always wanted to try it out, I've decided to give it a go and use git-svn. But reading through documentation I realized that you can't use much of git awesomeness with it. You can't use git-pull, it is not recommended to create loc...
Ive got a project on github which has ended up with a project "inside" and I would like to do a move like described in detach-subdirectory-into-separate-git-repository. My added question is, how do i effectuate this on github as well? ...
How can I examine a changeset in mercurial without looking up its parent? In mercurial, what's the equivalent of git show HEAD^ Git-show gives the changeset metadata and the diff as well. ...
I am trying to run git-svn using TortoiseGit and am having problems (405 Method not allowed) and am wondering if the problem is that the svn server is too old (svn 1.3). Is there any documented compatibility list of git-svn and svn server? ...
Hi, I have 'git' install, but I am not sure if I have the 'svn' bridge install as well ("the part to run 'git svn'). So I tried to do sudo port install git-core +svn on Mac. But I end up getting: ---> Activating git-core @1.6.3.3_0+doc+svn Error: Target org.macports.activate returned: Image error: Another version of this port (git-...
Thank you. From the link http://trac.webkit.org/wiki/UsingGitWithWebKit, there are these 3 steps in checking out Webkit using git. Which step i need to change to specify checkout a right version of Webkit for chromium? Thank you. git clone git://git.webkit.org/WebKit.git WebKit cd WebKit git svn init -T trunk http://svn.webkit.org/rep...
The title says it all... Edit: Well, maybe it doesn't say it all. I need only the source tree and its history. I don't care for the requirements/issues stuff for now. I played a bit witth the command line to figure out if I could get a list of change packages for the trunk and some of the dev paths. I thought it should be possible to e...
I'm relatively new to version control, and so far only have experience working with Subversion using TortoiseSVN/VisualSVN. I've been reading about other types of VCS (git, mercurial, etc), and am considering trying them out - however, many of the arguments for or against a particular VCS seem like they largely come down to subjective pr...
I just had a quick question about git - how backwards compatible are git repositories? Eg., I've created a repository using git 1.6.4 and the svn2git ruby script, but I want to put it on a machine that's running Debian Lenny, which has git 1.5.6.5. Would I still be able to interact with the repository properly? ...
Hi, I use the following to checkout source from Webkit git clone git://git.webkit.org/WebKit.git WebKit How can I skip a directory and its child directories when checkout out the code? I want to do that to save disk-space. ...