git filter-branch --subdirectory-filter

最新推荐文章于 2025-03-06 10:31:15 发布

hushui

最新推荐文章于 2025-03-06 10:31:15 发布

阅读量580

点赞数

分类专栏： git 文章标签： git linux内核版本升级源码管理 buildroot

本文链接：https://blog.youkuaiyun.com/hushui/article/details/120670045

版权

git 专栏收录该内容

54 篇文章

订阅专栏

git 库

buildroot

linux

2个子目录放弃buidlroot

将linux提升为根目录，保持git日志不变

-bash-4.2$ git clone  https://github.com/Broadcom/stblinux-4.9.git
Cloning into 'stblinux-4.9'...
remote: Enumerating objects: 201985, done.
remote: Counting objects: 100% (7916/7916), done.
remote: Compressing objects: 100% (7189/7189), done.
remote: Total 201985 (delta 778), reused 3605 (delta 674), pack-reused 194069
Receiving objects: 100% (201985/201985), 864.30 MiB | 6.22 MiB/s, done.
Resolving deltas: 100% (58958/58958), done.
Checking out files: 100% (69234/69234), done.
-bash-4.2$ ls
stblinux-4.9
-bash-4.2$ cd stblinux-4.9/
-bash-4.2$ git branch
* master
-bash-4.2$ git branch -av
* master                795271b49 Import 4.9-1.25 release
  remotes/origin/HEAD   -> origin/master
  remotes/origin/master 795271b49 Import 4.9-1.25 release
-bash-4.2$ git log
commit 795271b49a81886623ed154456ddd6af2238473c
Author: stbimport <nobody@broadcom.com>
Date:   Fri Sep 24 14:25:56 2021 -0700

    Import 4.9-1.25 release

commit 9dcc5e61b0a359e22a451ac5088f166f26bde9bb
Author: stbimport <nobody@broadcom.com>
Date:   Mon Jul 19 17:39:46 2021 -0700

    Import 4.9-1.24 release

commit b023f7e873827ed3be72ad2c7597d6f682cde847
Author: stbimport <nobody@broadcom.com>
Date:   Fri Apr 30 17:06:30 2021 -0700

    Import 4.9-1.23 release

commit ed0b9e87baaba1aab6d3c05744ebb9bc27325021
Author: stbimport <nobody@broadcom.com>
Date:   Thu Mar 18 15:35:47 2021 -0700

    Import 4.9-1.22 release

commit 0b911456a8051bbd84294dc3c3f17e6110a99306
Author: stbimport <nobody@broadcom.com>
Date:   Mon Jan 4 12:40:47 2021 -0800

    Import 4.9-1.21 release

-bash-4.2$ ls -l
total 8
drwxrwxr-x 17 lhu3 Porcelain 4096 Oct  9 13:49 buildroot  --------->>  Remove 
drwxrwxr-x 24 lhu3 Porcelain 4096 Oct  9 13:49 linux      --------->>  Upgrade to git root folder  

-bash-4.2$ git filter-branch --subdirectory-filter  linux
Rewrite 795271b49a81886623ed154456ddd6af2238473c (26/28) (10 seconds passed, remaining 0 predicted)
Ref 'refs/heads/master' was rewritten
 
-bash-4.2$
-bash-4.2$ ls -l
total 688
drwxrwxr-x  33 lhu3 Porcelain   4096 Oct  9 14:02 arch
drwxrwxr-x   3 lhu3 Porcelain   4096 Oct  9 14:02 block
drwxrwxr-x   2 lhu3 Porcelain    103 Oct  9 14:02 certs
-rw-rw-r--   1 lhu3 Porcelain  18693 Oct  9 14:02 COPYING
-rw-rw-r--   1 lhu3 Porcelain  98277 Oct  9 14:02 CREDITS
drwxrwxr-x   4 lhu3 Porcelain   4096 Oct  9 14:02 crypto
drwxrwxr-x 120 lhu3 Porcelain   8192 Oct  9 14:02 Documentation
drwxrwxr-x 129 lhu3 Porcelain   4096 Oct  9 14:02 drivers
drwxrwxr-x  36 lhu3 Porcelain   4096 Oct  9 14:02 firmware
drwxrwxr-x  75 lhu3 Porcelain   4096 Oct  9 14:02 fs
drwxrwxr-x  28 lhu3 Porcelain   4096 Oct  9 14:02 include
drwxrwxr-x   2 lhu3 Porcelain   4096 Oct  9 14:02 init
drwxrwxr-x   2 lhu3 Porcelain   4096 Oct  9 14:02 ipc
-rw-rw-r--   1 lhu3 Porcelain   2258 Oct  9 14:02 Kbuild
-rw-rw-r--   1 lhu3 Porcelain    252 Oct  9 14:02 Kconfig
drwxrwxr-x  16 lhu3 Porcelain   4096 Oct  9 14:02 kernel
drwxrwxr-x  12 lhu3 Porcelain   8192 Oct  9 14:02 lib
-rw-rw-r--   1 lhu3 Porcelain 383394 Oct  9 14:02 MAINTAINERS
-rw-rw-r--   1 lhu3 Porcelain  61366 Oct  9 14:02 Makefile
drwxrwxr-x   3 lhu3 Porcelain   4096 Oct  9 14:02 mm
drwxrwxr-x  64 lhu3 Porcelain   4096 Oct  9 14:02 net
-rw-rw-r--   1 lhu3 Porcelain  18372 Oct  9 14:02 README
-rw-rw-r--   1 lhu3 Porcelain   7490 Oct  9 14:02 REPORTING-BUGS
drwxrwxr-x  25 lhu3 Porcelain   4096 Oct  9 14:02 samples
drwxrwxr-x  14 lhu3 Porcelain   4096 Oct  9 14:02 scripts
drwxrwxr-x  10 lhu3 Porcelain   4096 Oct  9 14:02 security
drwxrwxr-x  23 lhu3 Porcelain   4096 Oct  9 14:02 sound
drwxrwxr-x  29 lhu3 Porcelain   4096 Oct  9 14:02 tools
drwxrwxr-x   2 lhu3 Porcelain     97 Oct  9 14:02 usr
drwxrwxr-x   4 lhu3 Porcelain     41 Oct  9 14:02 virt
-bash-4.2$ git log
commit 0623953358a3b9288fc7fbd298a4f1d40d0e774a
Author: stbimport <nobody@broadcom.com>
Date:   Fri Sep 24 14:25:56 2021 -0700

    Import 4.9-1.25 release

commit a771d1181a9ba4aaf7d61defb5436df264551861
Author: stbimport <nobody@broadcom.com>
Date:   Mon Jul 19 17:39:46 2021 -0700

    Import 4.9-1.24 release

commit 83d7311033d87d33ee0ef24ef9fbee06e563257b
Author: stbimport <nobody@broadcom.com>
Date:   Fri Apr 30 17:06:30 2021 -0700

    Import 4.9-1.23 release

commit ec96506a6f74869e61b67055a23acc3257d92ae5
Author: stbimport <nobody@broadcom.com>
Date:   Thu Mar 18 15:35:47 2021 -0700

    Import 4.9-1.22 release