(最初,这一答案假定第3个政党部分来自公共邮袋,@jacob-dorman澄清说,他通过从大型项目的头版复制部分代码获得更新)。
您需要保留一个存放处2分行:
master : every time you get a new snapshot of the component, commit it to this branchtweaks : a branch based off the master branch, which contains the commits that constitute your custom tweaks
每次更新主编时,都要更新内容的新缩略,在<条码>上重新建立<条码>tweaks。 分支:
$ git rebase master tweaks
这将使你们的帽子实际上成为。
因此,从一开始,这是它想看指挥线的。
Grab the first snapshot & store it on the master branch
mkdir my-fork-of-shinything
cd my-fork-of-shinything
git init
cp -R /tmp/shinything-snapshot-1 . # copy the snapshot of code into your repo
git add -A // stages ALL directory contents for commit
git commit -m "V1 snapshot of the shinything component"
这设立了你的主司。
Add your tweaks on a new tweaks branch
git checkout -b tweaks // creates your new branch
... make your tweaks, commit them
后来,对原来的构成部分做了一些有意义的更新......
Grab a new component snapshot, update master & tweaks branches
git checkout master
rm -Rf * // delete the contents of the old snapshot
cp -R /tmp/shinything-snapshot-2 . // get the brand new snapshot in place
git add -A
git commit -m "V2 snapshot of shinything, brings fix for #234"
Your master branch now has an updated history of the component, with a commit for each snapshot update. Finally rebase the tweaks branch on to the master branch - each of the commits on your tweaks branch will be replayed, one after the other, on top of the new tip of the master branch:
git rebase master tweaks // re-bases the commits from your tweaks branch
More tweaks?
如果你需要增加更多的拖拉机,就应检查分行并添加:
git checkout tweaks
... make your tweaks, commit them
