How to put other repository changes to my repository like a commit?

Question

I have a repository what is a local repository based on this repository https://github.com/AshamaneProject/AshamaneCore

I want to merge all their commits to my repository as a single commit with all the changes, how can i do it?

Im using ubuntu 17

" as a single commit with all the changes" - this statement is contradictory. If it's a single commit then you lose change history. Change history is a series of commits. — Dai, Apr 09 '18 at 01:57
@Dai hello thanks for your answer, im not triying to dont preserve the history i just want to merge their changes to my repo to keep my repo updated with their changes — Alejandro Baena Thai Dj Alex T, Apr 09 '18 at 01:57
Sounds like you want a Git Submodule then: https://git-scm.com/docs/git-submodule — Dai, Apr 09 '18 at 01:59
You used `repository` three times in a single sentence. Cool. — Tim Biegeleisen, Apr 09 '18 at 02:00
@TimBiegeleisen Im from Spain sorry, english is not my native language.. — Alejandro Baena Thai Dj Alex T, Apr 09 '18 at 02:04
Could you please explain your use case in more detail? Are you referring to rebase: But that's a series of commits or you are referring to merge requests? — Arihant Godha, Apr 09 '18 at 03:25
@ArihantGodha Hello, thanks for your help. I have a local copy from this repo (https://github.com/AshamaneProject/AshamaneCore) in a private repository where im doing some changes to this code but i want to merge their changes to have their changes in my own private repo — Alejandro Baena Thai Dj Alex T, Apr 09 '18 at 03:28
Yep, you can use squash or you may consider using the repo mirroring and push to a remote functionality of GitLab https://docs.gitlab.com/ee/workflow/repository_mirroring.html — Arihant Godha, Apr 09 '18 at 05:28

score 0 · Answer 1 · answered Apr 09 '18 at 07:22

Do you want a local repo with all the files in that repo, but you want your repo to have only one commit, that adds all their content at once? Then you can just clone the repo, remove the .git/ directory, init a new directory and add all the files and create that single commit.

If you already have a bunch of stuff and want to add theirs, you should probably fetch their stuff without merging it, and then do some kinda squash merge. So basically like this:

Add the remote
Fetch the branch you want to merge
Check out the branch you want to add their stuff to
Merge using something like git merge <remote>/<branch> --squash (I'm not perfectly sure about the syntax for squash)

This should also handle any divergent history, so that only the new commits they have made are included in the squashed commit.

Eddie · Answer 2 · 2018-04-09T07:42:49.547

As I can understand your problem, you'd like to make a clean copy of another repo and push to your own repo. If it was me, I'd do it like this:

git clone / download as zip

git init -> git remote add origin

git commit -am "initialize commit"

git push -u origin master

If you do a git clone, you can browser to the directory and delete .git folder ($cd <path-to-project>; $rm -rf *.git ) and continue from step 2.

By delete .git folder, you'll remove all previous commit/messages/logs, make it a clean new repo.

It's simply as this:

$git clone <#repo-url#> . (the dot is to clone to current directory, which should be empty)

rm -rf .git

(start from step #2 above)

How to put other repository changes to my repository like a commit?

2 Answers2