Is there an easy way to compare the file tree of an old git commit with the working file tree, in meld? git-difftool does something very similar, but I don't want it to actually do any diffing; the whole point is that the tool it is calling can provide a better interface for that. ...
This isn't the best programming question but lets face it, the server fault guys aren't well versed in git, so I think its more towards this audience. Do I have to write a script to uninstall them? How do I get them to go away, I want to switch to tortoise git, or portablegit in my shell, but I'm left with these annoying menu options. ...
I made some changes to an open source project without taking time to create proper patch files. Now, the maintainer of the project released a new version, and among new and edited files, there are a bunch of renamed files. Whats is the best way to apply my changes to the new version ? I'm completely new to diff/patch use, and If I can ...
I have a couple of branches defined for the current project where all but the master branch differ from master only by the same small set of files (less than ten). After implementing a new feature in master I would like to replicate those changes and additions to the other branches with the least effort. What's the recommended approach...
Our company has a large codebase in VB6, and we currently use VSS which, for all that we hate about it, at least integrates into the VB6 IDE. My own team, which is using .NET, are now looking into alternative SCMs like my personal favourite, Git. With Git Extensions, it seems we will be able to integrate Git commands into the Visual Stu...
I'm new to git so this may be a silly question: how do i checkout just one file from a git repo? ...
I'm new to git, on OSX, using it via command line. I come from the world of Tortoise SVN and Beyond Compare on Windows. I want to be able to pipe in diffs to happen via FileMerge which I have installed already. I was able to do this with TextMate simply by using: git diff | mate But I'm not sure how to get that set up so I can use ...
I've got a Git repository that has some files with DOS format (\r\n line endings). I would like to just run the files through dos2unix (which would change all files to UNIX format, with \n line endings), but how badly would this affect history, and is it recommended at all? I assume that the standard is to always use UNIX line endings f...
I created a local Git repo on my laptop and then pushed the source to Heroku creating a remote branch. After a few days of commits and pushes, I need to rollback to an earlier commit. Here's what I did. cd <app root> git checkout 35fbd894eef3e114c814cc3c7ac7bb50b28f6b73 Someone told me that doing the checkout created a new working tr...
I'm using Git Extensions and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I'm very fond of Winmerge though and would like to replace KDiff with Winmerge. In the Git Extensions settings, there are settings to change the Mergetool, but I can't seem to figure out what syntax I should use and why. There seem ...
I'm currently working on a project that has a svn repository. I'm used to git and love the way it allows me to have a local repository, so I would like to use git-svn with this project. I would like to know how to use git-svn from a svn project already in my computer. Do I really need to make a clone and start from there? Or can I just ...
I want to backup my code using smart Git. As a start I am a bit confused, IntelliJ has created two folders for my GRails project: these reside in 1) C:\Documents and Settings\me\.grails\1.2.1\projects and 2) C:\Documents and Settings\me\IdeaProjects\ The 1) contains a plugins folder which contains directories and files of plugins I a...
I have an idea of locking a repository from users pushing files into it by having a lock script in the GIT update hook since the push can only recognize the userid as arguments and not the branches. So i can lock the entire repo which is just locking a directory. Is there a way to lock a specific branch in GIT? Or is there a way an Upd...
I've heard a few places that one of the main ways distributed version control systems shine, is much better merging than traditional tools like SVN. Is this actually due to inherent differences in how the two systems work, or do specific DVCS implementations like Git/Mercurial just have cleverer merging algorithms than SVN? ...
I use git checkout -b somebranch origin/somebranch to make sure my local branches track remotes already. I would like a way to pull from the tracked branch no matter which branch I am using. In other words, I want to say git pull or some other command, without specifying the branch, and have it mean git pull origin somebranch if I'm on t...
Is there an introduction to the world of git that has a similar style and structure as Hg Init? ...
I know of some people who use git pull --rebase by default and others who insist never to use it. I believe I understand the difference between merging and rebasing, but I'm trying to put this in the context of git pull. Is it just about not wanting to see lots of merge commit messages? Or are there other issues? ...
Is there a Python way without using a subprocess to clone a git repository? I'm up for using any sort of modules you recommend. ...
I don't see an option to checkout or list remote/local branches in this module http://gitorious.org/git-python/ ...
I'm trying to compare my copy of 'master' to that on the remote repository which it tracks. I thought that the following command would work, and often it seems to. However, sometimes it produces nothing and yet I know that the remote branch has many changes, which I can confirm by doing a pull. git log master..origin/master Can any...