合并多个git仓库成一个

在嘉立创开源广场上,复刻了好多项目。

后来准备在github留个记录,就建了好几个仓库。

现在觉得好几个仓库,管理有点混乱,就准备合并成一个。

特点:每个子项目放进独立子目录、保留原有全部提交历史,适合你这种一堆复刻工程收拢到一个大仓库;合并完删掉临时 remote,仓库干净。

1、创建新仓库

mkdir jlc-reproduce-project
cd jlc-reproduce-project
git init
# 关联你github上新的空仓库<br />git remote add origin https://github.com/sunliguo2020/jlc-reproduce-project.git

2. 添加第一个本地仓库为 remote 并合并

# 1)添加临时remote(名字随便取,repoA/repoB都行)
git remote add repoA https://github.com/OliverLuo1986/USBMeter.git

# 2)拉取这个仓库的所有提交
git fetch repoA

# 3)把子仓库全部内容放到前缀目录 USBMeter,保留完整git历史
# --prefix=子目录名 :就是在总仓里新建这个文件夹放项目
git subtree add --prefix=USBMeter repoA master

# 4)导入完成,删掉临时remote,避免干扰后续导入
git remote remove repoA
  • /path/to/repoA 换成你本地仓库的真实路径
  • master 换成实际的分支名(main 或别的)
  • 如果 repoA 有多个分支,fetch 后可以用 repoA/main 这类引用

git remote add repoA https://github.com/sunliguo2020/ESP32-LED-Clock.git
git fetch repoA
git subtree add –prefix=ESP32-LED-Clock repoA master

如果是本地旧仓库(你电脑上之前自己的复刻仓库,不是别人的 github):

git remote add repoA /f/github/old-repo-path
git fetch repoA
git subtree add --prefix=ESP32-LED-Clock repoA main
git remote remove repoA

 

例子:

sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$ git remote add repoA https://github.com/OliverLuo1986/USBMeter.git
sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$ git remote -v
origin https://github.com/sunliguo2020/jlc-reproduce-project.git (fetch)
origin https://github.com/sunliguo2020/jlc-reproduce-project.git (push)
repoA https://github.com/OliverLuo1986/USBMeter.git (fetch)
repoA https://github.com/OliverLuo1986/USBMeter.git (push)

 

sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$ git fetch repoA
remote: Enumerating objects: 45, done.
remote: Counting objects: 100% (45/45), done.
remote: Compressing objects: 100% (36/36), done.
remote: Total 45 (delta 4), reused 45 (delta 4), pack-reused 0 (from 0)
Unpacking objects: 100% (45/45), 20.28 MiB | 1.41 MiB/s, done.
From https://github.com/OliverLuo1986/USBMeter
 * [new branch]      master     -> repoA/master

sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$ git subtree add --prefix=USBMeter  repoA master
git fetch repoA master
From https://github.com/OliverLuo1986/USBMeter
 * branch            master     -> FETCH_HEAD
Added dir 'USBMeter'

sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$ git remote -v
origin  https://github.com/sunliguo2020/jlc-reproduce-project.git (fetch)
origin  https://github.com/sunliguo2020/jlc-reproduce-project.git (push)
repoA   https://github.com/OliverLuo1986/USBMeter.git (fetch)
repoA   https://github.com/OliverLuo1986/USBMeter.git (push)

sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$ git remote remove repoA

sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$ git remote -v
origin  https://github.com/sunliguo2020/jlc-reproduce-project.git (fetch)
origin  https://github.com/sunliguo2020/jlc-reproduce-project.git (push)

sunliguo@DESKTOP-F5FCNSM MINGW64 /f/github/jlc-reproduce-project (master)
$

3. 添加第二个

git remote add repoB /path/to/repoB
git fetch repoB
git subtree add --prefix=repoB repoB master

4. 完成

git log –oneline –graph

5、清理临时 remote

git remote remove ESP32-LED-Clock

一键模板(复制即用,每次换项目改 3 个变量)

# ========== 每次导入新项目修改下面3行 ==========
REMOTE_NAME=repoX
PREFIX_DIR=ProjectName
REPO_URL=https://xxx.git
BRANCH=master
# ==============================================
git remote add $REMOTE_NAME $REPO_URL
git fetch $REMOTE_NAME
git subtree add --prefix=$PREFIX_DIR $REMOTE_NAME $BRANCH
git remote remove $REMOTE_NAME

 

发表评论