How would I change to the directory C:/Users/myname/project name in Git Bash?
Since few days ago, every time I start Git GUI in a repository, it displays this horrifying error message and quits after I click OK: prepare-commit-msg hook failed: 0 [main] us 0 init_cheap: VirtualAlloc pointer is null, Win32 error 487 AllocationBase 0x0, BaseAddress 0x68560000, RegionSize 0x260000, State 0x10000 C:\Program Files (x86)\Git\bin\sh.exe: *** Couldn’t reserve space […]
We have two Subversion repositories, each with a single project. So: svn://server/svn/project_a svn://server/svn/project_b They are separate projects, and are in separate repositories with completely separate commit histories. Project A has r1, r2, … r100 and Project B has r1, r2, … r400 We would ultimately like to merge these two SVN repositories into a single […]
Within a bash script, what would be the simplest way to verify that a git URL points to a valid git repo and that the script has access to read from it? Protocols that should be supported are git@, https://, and git://. Curl fails on the git:// protocol. email@example.com:UserName/Example.git https://UserName@github.com/UserName/Example.git git://github.com/UserName/Example.git Note: I’m not asking […]
I have two tags in my git in same branch. There are at least 5-6 commits between them. How can I create a single patch between the two tags so that it can be applied to a GitHub repo?
I’m trying to figure out the best workflow for maintaining a local copy of a github-hosted project (moodle) with customizations, while maintaining the ability to keep our copy up-to-date. Tell me if what I’m thinking about doing is completely insane: Fork the project (github.com/moodle/moodle –> github.com/sfu/moodle) Create an upstream remote (git remote add upstream git://github.com/moodle/moodle.git […]
I’m using git 1.7.1 on Ubuntu 10.10 amd64, and I’m trying to extract the hash of my repository HEAD to use it in an automated version information that I compile into my project. In the past, this always worked by using git describe –tags however, git is now throwing fatal: No names found, cannot describe […]
I have 2 branches, which are not ready to be merged yet, but have some complementary logic, which I’d like to review (before merging) Can I check out multiple git branches of the same project? Is it possible?
To use git effectively (and as intended) I make small atomic commits, while I do have longer sessions where I do change not only one thing. Thus, I make heavy use of git add -p. This doesn’t work for completely new files, though, because I tend to forget them later on. What I want to […]
How can you git-checkout without overwriting the data? I run git checkout master I get error: Entry ‘forms/answer.php’ would be overwritten by merge. Cannot merge. This is surprising, since I did not know that Git merges when I git-checkout. I have always run after the command separately git merge new-feature. This seems to be apparently […]