Question

Quick question:

I’ve run into a little issue, where I just need some insight into what I should do with some code I have.

I have one repository, in two locations. The “older” code is located in /originalcode and the new checked-out code is in /just-checked-out.

Here’s the problem:

Over the past few months, I’ve been updating code in /originalcode and there have been several new updated to the code (I kinda got lazy with my repository and never commited new changes).

I’m wanting to merge all my changes into the code repository using the new protocol (I changed from git+ssh to smart http).

Is this as easy as changing the “remote” url in the git config file. I just want to make sure that I’m following proper guidelines and don’t overlook something.

Answer 1

For all remote settings, you can fiddle with .git/config as Greg mentions,
… or you should have a look to git remote command: that will achieve the same effect, but with much more options (set-head, set-branches, …), without having to look at git config man page.