Hi, By default git init creates a folder called '.git'. In the recent Visual Studio tools (2005 and up) this works fine. But Visual Studio 2003 (and ... VB6 as well probably) crashes on this foldername. ideally I would like to change this per repository to something like 'git' instead of '.git'. Is this possible? I know this has been a...
Is there a command that allows you to partially undo the changes to a file (or files) in the working directory? Suppose you have edited a file a lot but you realise that you want to undo some of them to the committed state but not others. I'm envisaging an option for git checkout that works a lot like git add -p i.e., it goes through the...
Is it possible to create a non-visible branch in git or mercurial I can use as backup? Eg at the end of the day I have unfinished work (may even be left with syntax errors) but I want it to be backed up in the repository online, without annoying others about the mess that's left. ...
I installed Git with svn in MacPorts by sudo port install git-core +svn I have tried to use git-svn unsuccessfully by git svn egUrl and git-svn egUrl How can you use Git-svn in Mac after MacPorts' installation? ...
I recently screwed up my git repo and would like to find out if there is any remedy to it. My setup is this: Central repo on github. Personal repo on github (which is a fork of Central) +Central is setup as remote (upstream/master) +Master branch (origin/master) +Feature branch (origin/feature) My workflow was like this: Ne...
Hi, I am using git while developing VHDL code. I am doing development on a component in a git branch: comp_dev. The component interface does not change, just the code inside the component. Now, this component already exists in the master branch, but in a more stable version, enough for other developers to be able to use the component. Th...
I have two branches that are different enough that rebasing seems to not work -- or I don't know how to do it. I have a "public" branch with a bunch of files removed (using filter-branch). Even though most of the commits match up in terms of deltas, the commit ids are all different. I've tried quite a few methods to pull changes from ...
When switching back from a local branch, I accidentally checked out a new branch, MASTER, and pushed it to origin. Now the repo has master and MASTER as branches. How do I safely rename MASTER and rebase it into master? Thanks! ...
I'm tracking a Virtual PC virtual machine file (*.vmc) in git, and after making a change git identified the file as binary and wouldn't diff it for me. I discovered that the file was encoded in UTF-16. Can git be taught to recognize that this file is text and handle it appropriately? I'm using git under Cygwin, with core.autocrlf set ...
I have a bunch of handy aliases set up in the config file for my git repository. I will occasionally clone this repository (e.g. onto my laptop), but the clone does not included any of the aliases I've set up, presumably because the clone does not copy the git config file where the aliases are stored. I would, however, like to have thes...
I am trying to understand how Git works better. Given some arbitrary files and some arbitrary number of commits, how does git decide on how to split those files into blobs that are then uniquely identified with SHA-1 hashes? I just did about 10 commits of perl/C/java code and text into new git repo and somehow git divided the files int...
I've just started using Git and it's possible I've missed something obvious, but here goes: I'm using msysgit 1.6.2.2 on Windows XP While installing, I picked option 1 to "Use Git Bash only" I'm trying to put together a wrapper script that I can use to replace the built in git diff with DiffMerge. Based on this thread on SO, I create...
If I am working in multiple branches on a single feature, I use git pull branch1 branch2 branch3 to pull all the changes into my master branch. However, all the commit logs of each branch are copied as well. How do I flatten the commit log down to a single message? ...
How do I get git to use a proxy server? I need to check out code from a git server, it shows "Request timed out" every time. How do I get around this? Alternatively, how can I set a proxy server? ...
I plan to migrate my projects over to git, and I'm currently wondering which is the best and / or most stable option under windows. From what I gather I basically have 2.5 options: MSYSgit git under Cygwin (aka 2.5) MSYSgit from a Cygwin prompt (given that Cygwin git is already installed). Note: IMO Cygwin in itself is a big plus as...
I'm looking for some Rails/Facebook functionality that has already been built - as a starting point for my own Facebook-consuming Rails app. The problem is, when I search on Github I find gazoogles of apps that fall into this category and no easy way to distinguish one from the other. Is there a secret to this? Or do you only use Github ...
As I've mentioned in a previous question, I'm looking into migrating our source control from Perforce to git. Looking around, I've found p4-git (you have to dig a bit more, since it's not even at the repository pointed by the link. The actual p4-git script harder to find). I'm now running this script, and it imports the current versio...
I want to use version control for a partner project for school, but these days it seems like there are no private, free VCS hosts that I could use. I would prefer to use git if possible, but I wouldn't mind SVN. Alternatively, if there aren't any, shouldn't there be some way for me to use git without a central repository? I don't know en...
I've recently started getting into Git on a personal project, and I can see how a DVCS might benefit us at work (which is a large enterprise software company, currently running Perforce). Feature work in my team for example mostly consists of developers creating their own branches; sometimes these are shared between small teams of devel...
I probably did this incorrectly. I made some changes to a git repository and committed these successfully, pushing them to the central repository. I realise now that I want to tag the current version of all files. So I do: git tag -a 0.5 That succeeds. But now I try a git push and I am told there's nothing to commit. How do I push...