I'm not sure if this is possible but I'd like to be able to have a single file and use it in two projects saved in git repostories. Such that, if I make a change in one project the other one would pick up that change when the file was pulled. Ideally the history of that particular file would show all the changes from both projects. Ever...
I tried looking for a special git command for this but couldn't find one. Can anyone suggest anything shorter or faster than: git branch | awk '/\*/ { print $2; }' ...
git log lists all commits, from all branches that have been merged into HEAD. I want to get a list of merges, so I can see which branches have been merged into this one, and when. How can I get that information? I'm looking for something besides "launch gitk and look at the graph", since I know that one, but for very large histories wit...
I have a large project that I was upgrading to edge Rails. I made a copy of the entire project directory and refactored there as a precaution to trusting git (or at least how I might use/misuse it). After completing most of the work I returned to the original project directory and at the console (this is from memory and so is loosely b...
Let's say I have four projects named Core, A, B, Super. The dependency tree is like this: Super ---> Core |-> A -> Core |-> B -> Core I want each project to be stand-alone, that is, I want to be able to check-out and compile each project on its own (each with its dependencies of course). I thought about mapping each pr...
How can I query git to find out which branches contain a given commit? gitk will usually list the branches, unless there are too many, in which case it just says "many (38)" or something like that. I need to know the full list, or at least whether certain branches contain the commit. ...
I want to export a Git repository (G) to a SVN repository (S). S has been initialized with the standard layout (branches/tags/trunk) and G has the development history so far. I followed the advice in the Google Open Source Blog which details how an export G → S works. Basically the blog recommends to git-svn clone S into an empty directo...
OK so I'm tracking a remote repo on two machines so both have the master branch. I also made a local branch on my laptop called development. Is there a way for me to copy that local branch over to my desktop computer? I'd use my laptop but for some reason I'm having trouble with gdb and emacs... Edit: This worked for me git remote a...
I have a project that contains many sub-folders at it's root. One of the folders really should have been put into it's own repository from the beginning. Is there a way to pull out the history for just that sub-folder and then put it into it's own repository? Thanks, Blake ...
I'm trying to keep my static files in a separate branch so that I can keep them from merging into my master brach (on Heroku, your application's slug needs to stay small). I don't want to ignore my static files, because I want to keep them inside my "devel" branch. Ideally I'd like to keep test.db blank and my entire public folder blan...
For working with text that is prose, stored in plain text, I really like the output of git diff --color-words, but I don't like the way it is dependent on ANSI terminal escape sequences. I'd like to get output that I can use to turn into HTML, some kind of user-friendly raw character display, or to generate statistics on the differences...
Consider the following scenario: I have developed small experimental project A in its own git repo. It has now matured, and I'd like A to be part of larger project B, which has its own big repository. I'd now like to add A as a subdirectory of B. How do I merge A into B, without losing history on any side? ...
I'm considering migrating from Subversion to Git at work, and would like to get opinions about the best way to set up Git on Windows, and any problems that might arise from the combination of Visual Studio and Git. The current setup is TortoiseSVN, with Visual Studio 2008 and AnkhSVN for .NET applications. The replacement would probably...
At work, we are using ASP.net 2.0 and VSS. VSS is a beast, we are continually having issues with people checking out files and there is no branching - makes it crazy. I know SVN/GIT is mainly used by open source developers, are there any downsides to ASP.NET developers using it? I have been pushing for SVN internally, but am thinking GIT...
Hi, I recently came to git for a project I participate to. I found git gui rather handy (under OSX Snow Leopard) to srtat with but I would much like if it were not localized (in French, in my case). Is there preference or hack to have git gui displayed in english ? Thanks in advance, Julien ...
Here's an interesting experiment with using Git. Think of Github's ‘pages’ feature: I write a program in one branch (e.g. master), and a documentation website is kept in another, entirely unrelated branch (e.g. gh-pages). I can generate documentation in HTML format from the code in my master-branch, but I want to publish this as part of...
In Git, how can I organize work to track local config files of a library, which is a git submodule? In details: the library has normal files that are tracked, and default config files that are in it's folder, but not tracked, in order to avoid resetting or overwriting them (they're listed in .gitignore). All the files are in lib's fold...
Hi all Im new to GIT and dont know yet how much it will fit my needs, but it looks impressive. I have a single webapp that i use for differents customers (django+javascript) I plan to use GIT to handle these differents customers version as branches. Each customer can have custom files, folders and settings, improved versions... but th...
I would like to allow other members of our team to push to a github repository, as there are other people I "trust" and dont want them to have to constantly bug me to do a push. The only way I can see would be to add all our public keys into a single github repository. Is this the correct way to do it? ...
I've moved a bunch of files around manually without thinking, and can't find a way to get git to recognize that the files are just moved and not actually different files. Is there a way to do this other than removing old and adding the new (and thus losing the history), or redoing all the changes with git-mv? ...