automate/git-update.md

981 B

the procedure to update sd-card-images repo

cat .git/config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = git@git2.ring-zero.co.uk:cyteen/sd-card-images.git
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
        remote = origin
        merge = refs/heads/master
[branch "devuan"]
        remote = origin
        merge = refs/heads/devuan
[branch "cherry"]
        remote = origin
        merge = refs/heads/cherry
[branch "add_devuan"]
        remote = origin
        merge = refs/heads/add_devuan
[remote "upstream"]
        url = https://github.com/johang/sd-card-images.git
        fetch = +refs/heads/*:refs/remotes/upstream/*
[pull]
        ff = only


git pull upstream master

git reset --hard upstream/master

git push origin master --force

git branch backup-devuan

git rebase master

git push origin devuan --force-with-lease