Skip to content

Latest commit

 

History

History
28 lines (21 loc) · 700 Bytes

readme.md

File metadata and controls

28 lines (21 loc) · 700 Bytes

kava-patches

these are the patches applied to the forks of various dependencies of the Kava blockchain.

they are given as git patches that may be applied to future upstream releases.

to create a patch, use git format-patch:

# patch of just the current head commit:
git format-patch HEAD^

# patch of all commits between two refs:
git format-patch v1.2.x..release/v1.2.x-kava

# patches for n commits before ref:
git format-path -<n> my-git-ref

to apply a patch, checkout the desired base branch then:

git apply <path-to-patch-file>
git commit -a

for patches that will result in conflicts:

git am --3way <path-to-patch-file>