To simply create a diff patch in git’s diff format from two arbitrary files or directories, without any fancy repository stuff or version control: git diff –no-index some/path other/path > some_filename Jakub Narębski’s comment on knittl’s answer hinted at the answer… For simplicity’s sake, that’s the full command. The > part creates a file and … Read more
Using the update hook You know about hooks – please, read the documentation about them! The hook you probably want is update, which is run once per ref. (The pre-receive hook is run once for the entire push) There are tons and tons of questions and answers about these hooks already on SO; depending on … Read more
Semantic Merge. Languages supported, from the website: We started with C# and Vb.net, then added Java. Now C is already supported and then we’ll focus on C++, Objective-C and JavaScript, depending on your feedback
The only tool that has incremental import seems to be git-cvsimport. If you want to convert (migrate) from CVS to Git, the best solution for now seems to be mentioned above cvs2git mode of cvs2svn. See also Interfaces Frontends And Tools page on Git wiki, section about interaction with other revision control systems.
Just a quick comment to remind you that: those migrations often offer the opportunity to reorganize the sources, not along modules (each with one repositories) but rather along a functional domain split (several modules for a same given functional domain being put in the same repository). Then submodules are to be used, as a way … Read more
What I’ve done in the past is to have a default config file which is checked in to source control. Then, each developer has their own override config file which is excluded from source control. The app first loads the default, and then if the override file is present, loads that and uses any settings … Read more
Have you ever: Made a change to code, realised it was a mistake and wanted to revert back? Lost code or had a backup that was too old? Had to maintain multiple versions of a product? Wanted to see the difference between two (or more) versions of your code? Wanted to prove that a particular … Read more
The SHA is just one representation of a version (albeit canonical). The git describe command offers others and does so quite well. For example, when I run git describe in my master branch of my Java memcached client source, I get this: 2.2-16-gc0cd61a That says two important things: There have been exactly 16 commits in … Read more
Fortunately for those of us who are still forced to use CVS, git provides pretty good tools to do exactly what you’re wanting to do. My suggestions (and what we do here at $work): Creating the Initial Clone Use git cvsimport to clone the CVS revision history into a git repository. I use the following … Read more
I have been where you are now, sceptical of the uses of distributed version control. I had read all the articles and knew the theoretical arguments, but I was not convinced. Until, one day, I typed git init and suddenly found myself inside a git repository. I suggest you do the same — simply try … Read more