Jonathan Druart
bbb4c847b4
git reset --hard origin/master
git remote add kumara https://git.koha-community.org/koha-community/kumara
git remote add oldkoha https://git.koha-community.org/koha-community/oldkoha_1_0_7
git merge --no-edit -s subtree kumara/master --allow-unrelated-histories
git merge --no-edit -s subtree oldkoha/master --allow-unrelated-histories
perl $releate_tools_dir/koha-update-contributors
git commit -a -m"21.05.00 - Update contributors.yaml"
perl $releate_tools_dir/koha-update-history
git commit -a -m"21.05.00 - Update history.txt"
git format-patch HEAD -n2
|
||
|---|---|---|
| .. | ||
| CAS | ||
| development | ||
| contributors.yaml | ||
| history.txt | ||
| teams.yaml | ||