visortelle commented on code in PR #824: URL: https://github.com/apache/pulsar-site/pull/824#discussion_r1512903123
########## 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: Would it make sense to commit the local git config to `<pulsar_repo_root>/.gitconfig` instead of configuring it globally? This way no need to do additional steps for users. -- 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]
