My rails app is in a svn repository, but several of the plugins are installed through git and later added to the svn repo. How can I update these plugins? I can't seem to get script/plugin update to do anything. I'd really like to update activemerchant to get rid of the Inflector warnings. ...
How do I set gc.reflogExpire so that items will never expire? What other time interval formats does it accept? The man page says that you can set it to "90 days or 3 months," but doesn't specify what format it expects. ...
I've a small project that I want to share with a few others on a machine that we all have access to. I created a bare copy of the local repo with git clone --bare --no-hardlinks path/to/.git/ repoToShare.git I then moved repoToShare.git to the server. I can check it out with the following: git clone ssh://user@address/opt/gitroot/re...
Suppose you have: A-B-C Now your compilation/test fail. The fix should be merged in A. My current work-flow is like that: $ git commit -m "fixA" A-B-C-fixA $ git rebase -i A~1 And squash fixA in A, result in: A'-B-C Question! Is there a command to do something like A-B-C + (index with fix for A) $ git commit -supperdupper...
I'm exploring git to see how it might work for my company. I've got git installed and I need to know a couple things: How can I set up a git server on my computer to act as my central repo? I'm trying to figure out how to manage my workflow with just the GUI on Windows (using the GUI is a requirement). How do I take a bunch of files in...
I have been maintaining the git mirror of the watir project. Some time a couple weeks ago, we had someone ready to submit their first git-based patch. Unfortunately, we ran into some issues regarding line endings (CRLF vs. LF, etc.) because of the multi-platform nature of the project. I tried what I could to set the autocrlf option (t...
I have made some changes to a file which has been committed in a few times as part of a group of files, but now want to reset/revert the changes on it back to a previous version. I have done a git log along with a git diff to find the revision I need, but just have no idea how to get the file back to its former state in the past. Any ...
I am responsible for a small development team and we deal mainly with database development. We are currently using MS Visual Source Safe as our source control system, but it has its limitations and we are seriously thinking about changing. What system would you choose? ...
We're using Github. I have committed, and pushed, several patches: A1-->A2-->A3-->A4 (HEAD) Everyone's pulled these changesets into their local copy. Now we want to "roll back" to A2, and continue developing from there - essentially throwing away A3 and A4. What's the best way to do this? ...
So I'm in the process of getting GIT sold at work. First thing I need is to convince everyone that GIT is better at what they're already used to doing. We currently use Perforce. Anybody else go through a similar sale? Any good links/advice? One of the big wins is that we can work with it disconnected from the network. Another win IMO i...
Given the hash of a blob, is there a way to get a list of commits that have this blob in their tree? ...
Within the last year I have become addicted to subversion. I am an only developer and I also work on a few of my own projects. With SVN its really easy to manage everything - and because it is hosted on an online server though HTTPS I can access my code from anywhere. It is also great for deploying code to our production/development serv...
This is sort of a follow-up to this question. If there are multiple blobs with the same contents, they are only stored once in the git repository because their SHA-1's will be identical. How would one go about finding all duplicate files for a given tree? Would you have to walk the tree and look for duplicate hashes, or does git pro...
I have been using git to keep two copies of my project in sync, one is my local box, the other the test server. This is an issue which occurs when I log onto our remote development server using ssh; git clone [email protected]:/home/chris/myproject Initialized empty Git repository in /tmp/myproject/.git/ Password: bash: git-upload-pack...
I have a git repository with multiple branches. How can I know which branches are already merged into the master branch? ...
Are there any good issue tracking systems that can track issues on git commits/branches? ...
Here are 2 different questions but I think they are related. When using git how do I find which changes I have committed locally but haven't yet pushed to a remote branch? I'm looking for something similar to the Mercurial command "hg outgoing" When using git how do I find what changes a remote branch has prior to doing a pull? I'm loo...
I've been trying to install Shoulda script/plugin install git://github.com/thoughtbot/shoulda.git but all I get is: removing: C:/Documents and Settings/Danny/My Documents/Projects/Ruby On Rails/_ProjectName_/vendor/plugins/shoulda/.git > And the vender/plugins directory is empty. I have Rails 2.1.1 installed as a gem and have verif...
Let's say branch B is a topic branch off of branch A, and you want those changes in branch C. What does it mean when you cherry-pick the merge commit of branch A and branch B to branch C? For example, if you use the -m flag to specify the old HEAD of branch A to cherry-pick the merge to branch C, does that simply mean "Take the diff be...
I've been working on an Eclipse plug-in project for a while now, and I've run into a situation where I need to split the project up to seperate the test cases from the plug-in package. I'm using git as version control. To describe this simply, I'm versioning the old project like this: workspace/ | +-- myplugin/ | ...