![]() ![]() In this case the commit applies cleanly and we can proceed to the next ones: Then we'll start the cherry-pick process with the earliest commit relevant to Bug 3475: Open another terminal window, leaving this one open to the git log output for reference, and create a new branch based on master to cherry-pick into: Probably with 'Added a copy patron link from moremembers page' In this example we have to make a guess at where the Bug 3475 fixes begin. ![]() If we're lucky we'll be looking at a clean branch that diverges from origin/master for that particular feature/bugfix. ![]() Looking at the history in the branch we have to find the earliest change relevant to the feature we want to cherry-pick. Git will warn you "You are in 'detached HEAD' state," but we're just checking out the branch to check the log of commits.įind the commits to cherry-pick git log -pretty=onelineģe86ed85fd595c99bd73292553ef1d09d95e53ae Added Copy Patron button to circ-toolbarĪb97540637691bd73581fed3828c164191c9e0bb Cleared the extended patron attributes from being copied when addingĠ4566389ae36651daf3dfa117a1088d594632370 Added a copy patron link from moremembers pageĥ95e6a190b9e90cf1371ac0b853999286948c852 Merge branch 'Bug3789' into ptfs-masterįa59e2f7480dc63d7824c5587c82c3f6df3b96ae Bug 3789 Set off shelving location in staff and OPAC title displayģ8ddef75baeb3f3bd4487cfc25340be9dc2baa4c Merge branch 'Bug3514' into ptfs-masterĥd3b6945764cd2a292f822963feca9cf12776605 Extends Bug 3514 syspref to control whether the Return column is actiĢ79dab8f631ba7aa44b8a35da7f5d43b24d699 syspref to control whether the Return column is active in Paġf1540f0218d5ad8348700f74c60ad7ca95625b OPAC "Search for title in" can fail with trailing slashes inĦe0cc4061e82c2f861aef1a0db584502c9a3268e Merge branch 'Bug4243' into ptfs-master Harley bugfix branches have been added to the main Koha git repo, so you don't have to add a new remote repo.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |