git push保存历史和分支

Question

I have a local repository I've created with 'git init' and started making commits. A 'remote' repository has been created for my work on some server and now I need to 'update' it with my entire work (preserving history and branches).

I assume I need to first clone that 'remote' into my machine, then 'update' it somehow to hold the entire historical content and then push, but: 1. - How do I do that? 2. - Is there a simple way to do that (meaning 'automatically' - so that git does it all for me)?

Cheers

Answer 1

Now I realised there is already "something" in that 'remote' repository, meaning local repository shall be 'pushed' as a branch of 'remote', so that my 'master' branch becomes a 'someName' branch on 'remote', again - preserving all history.

That is the issue: you cannot just push, especially if the master branch has already some history.

If your commits add to the existing content, what you would do is replay them on top of the existing remote history:

cd /path/to/local/repo
git checkout master
git remote add origin /url/remote/repo
git fetch
git rebase origin/master
git push -u origin master    

If the history is not related to the existing content, then it is easier to create an empty repo on the server side.
From there, a simple git push --mirror will push everything (all branches)

Answer 2

there is already "something" in that 'remote' repository, meaning local repository shall be 'pushed' as a branch of 'remote', so that my 'master' branch becomes a 'someName' branch on 'remote', again - preserving all history.

So the simplest way to solve your problem is to create a new branch with any name in your remote repo and push your local working copy's changes to that branch.

Simplest way to achieve is as follows:

Copy the url of the remote repo by using GitLab/GitHub then make a new folder anywhere in your system, open gitbash and write the following command:

git init

git clone <Paste the url>

You will get all the files in the master in your folder.

Then create a branch:

git branch <branch_name>

This will create aa new branch locally switch to the newly created branch as:

git checkout <branch_name>

Now paste all the files that you wanted to push to remote in the git folder.

Now we just have to commit as follows:

git add .

this command will add the files to the staging area.

git commit -m"Any message"

to commit the changes.

git push origin <branch_name>

Done!

where origin is the remote name Since we didn't create a new remote and cloned the existing remote repo. So by default the remote name will be origin