I have two git repositories that are tangentially related. Namely, content of one was a predecessor of the other. I would like to somehow prepend the full history of depository A to the depository B, so that tip of A would be a parent of the very first changeset of depository B? Histories in both are pretty linear. Is this possible? ...
I'm trying to make git ignore some of my files and I found one description about how you could do this From: http://github.com/guides/git-cheat-sheet TO IGNORE SOME FILES Add a file in the root directory called .gitignore and add some files to it: (comments begin with hash) *.log db/schema.rb db/schema.sql Git autom...
I want to upload my app to github so I can share portions of it for feedback and help...but it contains information used for logging into other services and so forth. How do I upload it into github without making it difficult to continue to use that repository for deploying into heroku? ...
This is what I have done so far and I will say this procedure worked on Ubuntu 9.10 which perhaps had a different version of git. server: mkdir ~/git local: scp -r /../project [email protected]:~/git/ server: cd git cd project git init git add . git commit -a -m "initial" local: git clone [email protected]:/../g...
It looks like nginx 0.8.35 may support chunked transfer encoding: Changes with nginx 0.8.35 01 Apr 2010 *) Change: now the charset filter runs before the SSI filter. *) Feature: the "chunked_transfer_encoding" directive. This is great, because I'm trying to get push git changes through an n...
Hi all, I am working on a github hosted project. For testing reasons, I have to move my computer date to somewhere in the future (2012) and forgot to bring it back to normal time when doing a git commit / push. The actual commit is now actually saved as 2012 instead of 2010 and it's screwing our github view since they always appear on...
I want to host git repos on my server, but still have a nice tool to manage them, such as Beanstalk or Assembla. Does anyone know of a similar tool which is downloadable (Other than Assembla private)? Security and reliability concerns won't allow for hosted solutions. ...
I used filter-branch to fix an incorrect email address in my repository but all the branches are now MIA (except master). This is what git graph showed prior to filter-branch: * d93c7ee (HEAD, master) Merge branch 'f1' |\ | * 08e7463 (f1) adding b |/ * 7c7bd91 adding a I issued this filter-branch command: git filter-branch --...
Hi, I have a web app under source control in git. I have different css files for different customers as well as images and other theme specific things. And also custom reports... Beside the theme things every other aspect of the app stays the same. What would be a recommended way to keep the app as well as the theme information under so...
We are working on a project where we are required to use Subversion as our version control system. We are all comfortable with it, but, on the holidays we would like to go out of town to focus on development. The problem is, there is a high probability not to have internet access where we're going. Since we still want to maintain code hi...
It seems to be quite hard to find good references about the pros and cons of these Version control systems. If someone can make a short and neat paper about it, mirror it and post it here, I think a lot of people would be less confused. What version control system should I use ? I think it depend on the project and on the number of peo...
I set up a remote Git repository on a shared host account I own. To allow another developer to push/pull, I added his public key (id_rsa.pub) to the end of .ssh/authorized_keys on the shared host. Then he was able to do "git push". But I want to make sure that he cannot do anything else on my shared host but access git, so I added thi...
Sorry, if this is a FAQ, but I can't find the answer. I'm intrigued by git. I've used nearly all of the usual players over the past decades. Currently on SVN and not really happy. I think I understand the basics, but I don't understand one key concept: how does a user in his/her house talk to/from my computer (separate houses, ISP, etc....
When I run commit from a standard command prompt it is opening the configured editor defined by the core.editor configuration value and uses the template defined by commit.template. However when I run commit from the bash command prompt it is ignoring these settings and opening the VI editor without the template. Why is this? I am n...
I'm fairly new to git, and I suspect the answer to this is no, but wanted to check with some of the more experienced git users here. I have a superproject which has a commit which includes a reference to a development branch of a submodule. I'm a little worried that when I rebase that development branch onto master and delete it that t...
I've recently moved from Eclipse to IntelliJ. A challenge as I'm a keyboard shortcut junkie, but that isn't what I'm here about. I miss having the git branch name shown in the package/project view. Does anyone know of a way to configure IntelliJ to display what git branch the project is in, so I don't have to keep switching back to t...
Hi, I want to revert a merge because instead of using git merge -s recursive -X ours, I've used git merge -s ours. I've read this blog post about reverting merges, but it doesn't seem to work for my case. So, I have the master branch, and then the topic branch. At some point I merged master into topic, and then merged topic into maste...
Hey, I have been working on a branch which we can call "A". I just realized that the code I have added since I last committed should rather be in a specific (experimental) branch, but not in "A". How can I commit the changes to a new branch and leave branch "A" as it was when I last committed? ...
Let's keep things simple shall we? I have a git project set up. Let's call it ProjectA. My friend has another, older git project set up, called ProjectB. In ProjectB, he has two submodules, SubOne and SubTwo, set up. Now, when I mean "set up", I mean he can just "git submodule update" them. They exist. Now, being selfish, I want to ste...
I've been through the mill with version control. I started with sccs, believe it or not. Worked with RCS. Moved to CVS. Was forced to use Visual SourceSafe, and hated it. Have been pretty happy with Subversion. I've been looking at the new distributed VCS - Git, Hg, etc. They look complicated. I have doubts over whether they prov...