I needed to use in my old Git similar settings to the following to be able use difftool. The settings are not exactly the same, since I by accident removed my old .gitconfig. [merge] tool=opendiff [mergetool] tool=opendiff [difftool] difftool=opendiff I have an empty .gitconfig at Home. I can use still the opendiff...
This question is based on VonC's comment at the thread. Is Git's auto-detection for difftool or mergetool scripted or is it within some Git executable? ...
I am doing some work to track down a perceived bug in a git support tool, and I want to copy a repository (possibly many times) for experimental purposes. I would like for hard links to be created to the original repository object database so as not to waste disk space storing multiple copies of identical objects with identical SHA valu...
The article has the following inputs and outputs git co master git merge [your_branch] git push upstream A-B-C-D-E A-B-C-D-E-F-G \ ----> \ your branch C-D-E G I am interested how you get the tree like-view of commits in your terminal without using Gitk o...
I run git tag v1.0.0 -m 'finally a stable release' I want to see a list of my Git tags. How can you see a list of Git tags? ...
I have a project in SVN and I tried to clone it with git-svn. I followed the example in the git-svn docs. git svn clone svn+ssh://host/path/trunk project_name The command completed with no error msg, but the cloned project does not contain all the directories as the project in SVN. At the top level, my SVN project has... $ svn ls ...
I've been using Mercurial for some development lately and have been loving it. I'm curious, is Microsoft using any form of distributed source control internally, and/or are they moving toward it in any way? I found this article: http://maratux.blogspot.com/2009/03/microsoft-uses-git-for-version-control.html It says that Microsoft is u...
I have a subversion repository hosted on Linux but only ever accessed via windows clients as it's for the source of a large Windows application. It would be awesome if I could work on this repository using git-svn (provided by msysgit). I'm having a heck of a time trying to get the repository to not get itself in a jam over the windows...
Has anyone tried or figured out how to import a gitorious repo into github? I already use github and wanted to see if there was a way to pull from a gitorious repo that I wanted to follow into github. ...
Hi, I'm looking for a way to have git-commit wait for standard input. I'm coding this in PHP, as my bash skills are non-existant, so I thougth doing a regular <?php $input = trim(fgets(STDIN)); fscanf(STDIN, "%d\n", $line); ?> would do the trick, and wait until I write stuff in to continue, but it just goes ahead and continues executi...
I like the way that in launchpad if I want to host an app of little use to the public (like, say, a program which prints dots to the console, the count of them depending on which hour it is) I don't have to litter the global hosting site's namespace and fill it up with names such as HourDot but I can put it in my own personal namespace ~...
Hi, I am having a hard time understanding the nuances of git-fetch. I understand that doing a fetch, fetches the remote refs into a local tracking branch. I have a few questions though: Can it be possible that a local tracking branch does not exist? If so, then will it be created automatically? What will happen if I do a fetch and sp...
I'm an experienced git user now working with people who use Mercurial. I really miss 'git gui' for helping me with my commits. I see that two tools, qct and hgct, both support Mercurial. The things I like best about git gui is that it shows all uncommitted files (and untracked files) and makes it easy for me to add whole files or indi...
Hi there, I'm using git version 1.5.6.3, and it seems git doesn't notice a folder's mode changes #create a test repository with a folder with 777 mode :~$ mkdir -p test/folder :~$ touch test/folder/dummy.txt :~$ cd test :~/test$ chmod 777 folder/ #init git repository :~/test$ git init Initialized empty Git repository in ~/test/.git/ :...
In my current repo I have the following output: $ git branch -a * master remotes/origin/master remotes/public/master I want to delete 'remotes/public/master' from the branch list: $ git branch -d remotes/public/master error: branch 'remotes/public/master' not found. Also, the output of 'git remote' is strange, since it does not...
I have a local repository I'm working on and it's remote is hosted on GitHub. I recently created a branch and started working on it making several commits and now wish to push the branch to GitHub and be able to pull it to another cloned repository. What needs to be done to accomplish this? If this is not possible using GitHub I'd be ...
I have a very old project that includes the source from another project directly, instead of linking it as a library. Back in the bad days, when I was keeping everything in CVS, I had the external code on a vendor branch and did periodic imports. Now that my project is in git it would make more sense to include the external project as a ...
I'm using msys-git and notice I often get strange characters in the output after doing a git pull. I presume these are some sort of control characters that some terminals might understand but in a standard windows command prompt they result in this: Source/MidiLib/AudioChannelMixer.cpp ←[m | 6 ←[32m+←[m Source/MidiLib/AudioEn...
I have run into a bit of a problem here: I had a problem-specific branch '28s' in git, that I merged in the general 'develop' branch. Turns out I had done it too fast, so I used git-revert to undo the merge. Now, however, the time has come to merge '28s' into 'develop', but git-merge command sees the original merge, and happily announces...
I would like to see all revision numbers that made any changes to a particular file. The output should look like follows: 20 27 59 If it is not possible, is it possible with Git? Thank you. ...