如何将一个 repo 移动到另一个 repo 文件夹并保留 git 历史记录？

Question

I want to move my project(egproject-A) to monorepo and keep whole git history. now when adding remote repository to new one with

git remote add A <remote-repo-project-A>

and pull project with

git pull project-A master --allow-unrelated-histories

source files are in folder monorepo\src instead of monorepo\apps\project-A\src

Basically I want to move repo-A to new repo with following structure:

repo-A
---- src

new repo
---- projects
---- ---repo-A(rename to project-A)
---- ------src

Answer 1

History, in Git, is simply the commits. The commits are the history. So the literal answer to the question that you didn't quite ask—"can I change the contents of the commits without changing the commits' contents"—is of course no . More importantly, no commit can ever be changed, by anyone or anything, because the commits are numbered , and the numbers are cryptographic checksums of their contents. So if you change anything about a commit, that changes the number .

All is not, however, lost. You can copy the commits to new-and-improved commits, whose only difference from the original commits is... well, let's take one commit as an example. The original commit says the files are named src/file1 , src/file2 , etc, and here are their contents: ... The commit was made by ____ on ____ and its parents are... The new-and-improved commit says the files are named projects/A/src/file1 , projects/A/src/file2 , etc., and here are their contents... The commit was made by (same person) on (same date) and its parents are (the new-and-improved copies of the original commit's parents).

This copying process is tedious but straightforward, and it can be done by git filter-branch , git filter-repo , and various other tools as shown in git move directory to another repository while keeping the history (among many other very similar questions). Note that if you have other additional repositories whose commits—or rather, new-and-improved copies of commits—you'd like to have in this repository, you must decide whether to convert each set of commits one at a time, then try to make combining (merge) commits to combine them, or to write a much fancier filter that attempts to combine all the other repositories' commits at once. That is, one new-and-improved commit might represent two or more "original" commits from other repositories. This is a much more difficult proposition and the existing filter programs that do the simple straightforward thing do not do this for you.

Answer 2

I tried the following steps.

[1] cd /path/to/work_folder

[2] git clone https://github.com/git_repo_1/git_repo_1.git

[3] cd git_repo_1/

[4] git remote rm origin

[5] git filter-branch --subdirectory-filter folder_to_move/ -- -- all

[6] mkdir folder_to_move

[7] git mv file(s) folder_to_move/ [8] git mv dir(s) folder_to_move/

[9] git add.

[10] git commit (add some comment)

[11] cd /path/to/work_folder

[12] git clone https://github.com/git_repo_2/git_repo_2.git

[13] cd git_repo_2/

[14] git remote add repo-A-branch /path/to/work_folder/git_repo_1/

[15] git pull repo-A-branch master --allow-unrelated-histories

[16] git remote rm repo-A-branch

[17] git push

All the above steps are successful. However when I go to github web interface and want to see the history of the modifications on that file within the folder I moved I do not see any history.

However on my terminal if I do the following

cd git_repo_2/ git log

I can see all the history for that folder I moved from git_repo_1 to git_repo_2

My question is --> Is there a way where I can see the history of the changes for each file after moving the directory from git_repo_1 to git_repo_2