visortelle commented on code in PR #824: URL: https://github.com/apache/pulsar-site/pull/824#discussion_r1512957875
########## 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 +``` +Notice! In some cases, it might be useful to disable rerere after an invalid merge resolution. In that case you will need to use `git rerere forget file` to forget the merge result. + +#### Install `tig` command line UI for git. + +`tig` is handy for viewing the git log and it can also be used for staging files and assisting with `git` command line usage. + +MacOS +```shell +brew install tig +``` + +Ubuntu Linux +```shell +sudo apt install tig +``` + +There are also other more feature rich alternatives such as [`gitui`](https://github.com/extrawurst/gitui) or [`lazygit`](https://github.com/jesseduffield/lazygit). + +#### Install `gh` command line tool for GitHub. + +Installing with `brew`, for other package managers, follow instructions at https://cli.github.com/. + +```shell +brew install gh +``` + +After installing authenticate to GitHub +```shell +gh auth login +``` + +#### Checking out each maintenance branch in a separate working directory + +For maintaining Pulsar, it is handy to have all maintenance branches checked out in separate working directories Review Comment: @lhotari FYI I haven't tried it yet, but there is a new project GitButler. https://docs.gitbutler.com/features/virtual-branches <img width="816" alt="Screenshot 2024-03-05 at 6 46 13 PM" src="https://github.com/apache/pulsar-site/assets/9302460/4eeb3686-4bac-467b-a369-d60e73165adc";> Someone who calls himself a GitHub co-founder is a CEO. https://www.linkedin.com/in/schacon/ <img width="589" alt="Screenshot 2024-03-05 at 6 48 03 PM" src="https://github.com/apache/pulsar-site/assets/9302460/2f5b09a3-69d0-4593-bbc8-73aaf67c5fab";> I heard that the tool is very opinionated and not fully compatible with traditional git branching model. -- 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]
