visortelle commented on code in PR #824: URL: https://github.com/apache/pulsar-site/pull/824#discussion_r1512904094
########## contribute/setup-mergetool.md: ########## @@ -90,6 +90,78 @@ sudo apt install git-gui There are many tools available for this purpose, but `git gui` is one of the simplest and most effective. +### Additional Git tuning + +#### Git configuration + +Increase default renamed file detection limit with mergetool and difftool +```shell +git config --global merge.renameLimit 2048 +git config --global diff.renameLimit 2048 +``` + +Enable [rerere](https://git-scm.com/book/en/v2/Git-Tools-Rerere), "reuse recorded resolution" for Git. +```shell +git config --global rerere.enabled true Review Comment: <img width="736" alt="Screenshot 2024-03-05 at 6 19 53 PM" src="https://github.com/apache/pulsar-site/assets/9302460/66fee9a8-2aa7-48b1-b45d-7e5eb9fa20f1";> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
