Where I work we need to rethink the way we develop software and keep track of each released version. Do you have any suggestions to solve our problems? We develop on Windows in C++ using VS 2005 (and C++ Builder for some interface stuff) We use GIT but in the worse possible way imaginable. We are somewhat open to move to another source...
How do you make git diff only show the difference between 2 commits, that is exclude other commits in between the 2? ...
I've just started using git and while it is relatively easy to find out how to do something with git I'm having trouble figuring out when to do something with git. For instance, when does one usually branch a project? I was thinking of branching each version of a current project and when it's complete merging it with the master - is th...
I know this isnt strictly a programming question but it is related to git. I accidentally have created a branch in git called "--track" (I got the order of options wrong when merging a remote branch) The regular command doesn't work: git branch -D "--track" I have tried to escape with quotes and backward slashes, however neither work...
The question is related to the question "How to restore Git after fatal file system error?", but for a single file. I need to get to last state 2009-07-27 23:58, where I need the file: /Users/henri/BAckup/6-relationdiagram/Normalized_perhaps_DB/simple_schema0.tcuml How can I restore the file after a crash? ADDED: Where will I find...
Beginner Git question: In the Mercurial world, "hg tags" gives me a list of tags and the corresponding revisions, whereas "git tag" only lists the tag names. How do I see what the matching rev number/hash is? ...
How do you setup a git repository where some users can see certain parts of the source code and other users can see all of it? I've seen lots of guides for only giving certain users commit access, but these assume everyone should have read access. I've also heard of gitosis, but I'm not sure it supports this and it hasn't had any commits...
I'm trying to combine code on two branches with the 'git merge' command, but git is crashing during the process. I need to find an alternative way to merge these branches. To increase merge output to a debug level I ran: $ export GIT_MERGE_VERBOSITY=5 I am currently on the destination branch. git-status shows everything clean an...
A 5 month project of mine is nearing its end and as a fan of pointless statistics, I'd like to know how many commits have been made since the repository's inception. How do I find that out? Notes: I know there is no one repository, I'm just interested in the local version. This is trivial in subversion, as the revision identifier se...
This may be more appropriate as an issue in whatever issue tracker/forum Git uses, but I thought I'd get an SO confirmation/explanation first: I have a repo tracking a bunch of installer executables. Let's say foo-1.0.exe is already in the repo. I now add foo-2.0.exe in the same directory (git add foo-2.0.exe). Next, I remove foo-1.0...
We have several config files in a project that 3 people are working on. However, those config files contain several lines that differ for each of us and so should not be changed or overwritten by commits. Yet Git won't let us pull changes from the other people unless we commit those config file changes which then means that it changes th...
I'm trying to git-cvsimport several different modules from CVS, all of which are on different branches. So far I've done this (in pseudo-bash code): for each ($MODULE, $BRANCH); do git-cvsimport -p x -v -d "$CVS_REPO" "$MODULE" -o "$BRANCH" -C "$MODULE" done But that makes a different git repository for each module. How would I m...
A nice and simple question - is the function of "git fetch" a strict sub-set of "git fetch --tags"? I.e. if I run "git fetch --tags", is there ever a reason to immediately run "git fetch" straight afterward? What about "git pull" and "git pull --tags"? Same situation? ...
I and my collegues are having terrible trouble getting git to behave properly with certain files on our Windows repostiory clones. The clones have been made by cloning a repository which originates on an OSX machine. We have set autocrlf to true, but the problem is that we reguarly find files that git thinks are changed even though we ...
Often when I do a checkout of a different branch, or a reset, I will get 'permission denied' errors from windows for one to a dozen files - but the particular files vary from run to run. Here's the output from a test I just did, with GIT_TRACE=1. The trace only added the one line before the error message: $ git checkout master t...
I want to track a project that uses git. I don't want to clone the full repository and the full history, I just want the latest revision, and I want to be able to update to new revisions from the remote project. I have tried using git clone, but this creates a copy of the entire repository (huge file size), and tracking changes makes th...
The name of the file is "\033[A.tex". Note that the filename includes two times the character ". I run unsuccessfully git rm ""\033[A.tex"" and git rm "\033[A.tex" How can you remove the file from Git? [edit] The filename is more challenging. Situation ...
Hi, I'm working on a web site project that is currently tracked in svn but is going to move to git once someone else has time to set up a new server and stuff. It's a long story, but in the meantime I've made my own git repository from some code I had, and worked on it quite a bit. I didn't use git svn clone because I'm overseas and my ...
I created a git repository with git init. I'd like to delete it entirely and init a new one. ...
It sounds to me like subversion's centralized model works better for web application development where you have a team of engineers working currently on the same code base and releasing constantly. On the other hand Git's distributed model is appealing for an IPhone app because 1) I dont' need a connection to browse the repository 2) it...