diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 3b2bf5a..8f86b82 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -9,6 +9,7 @@ * [User information](configuration/user.md) * [Git configuration](configuration/git.md) * [Repository information](configuration/repository.md) + * [Beyond Compare configuration](configuration/beyond-compare.md) * [Commits](commits.md) * [Fixing commits](commits/fixing.md) * [Stashing](stashing.md) diff --git a/src/configuration.md b/src/configuration.md index ad69c1e..08aa99f 100644 --- a/src/configuration.md +++ b/src/configuration.md @@ -4,3 +4,4 @@ The following sections covers general configuration and information. * [User information](configuration/user.md) * [Git configuration](configuration/git.md) * [Repository information](configuration/repository.md) +* [Beyond Compare configuration](configuration/beyond-compare.md) diff --git a/src/configuration/beyond-compare.md b/src/configuration/beyond-compare.md new file mode 100644 index 0000000..27e64c2 --- /dev/null +++ b/src/configuration/beyond-compare.md @@ -0,0 +1,11 @@ +# Beyond Compare +If you use [Beyond Compare](https://www.scootersoftware.com/), the following sets up Git to use it for diff and merge. + +```bash +git config --global diff.tool bc +git config --global difftool.bc.path "c:/Program Files/Beyond Compare 4/bcomp.exe" +git config --global merge.tool bc +git config --global mergetool.bc.path "c:/Program Files/Beyond Compare 4/bcomp.exe" +# This is up to the user on whether they want to keep .orig files. +git config --global mergetool.keepBackup false +``` diff --git a/src/configuration/git.md b/src/configuration/git.md index 207edaf..39e1f81 100644 --- a/src/configuration/git.md +++ b/src/configuration/git.md @@ -12,15 +12,3 @@ git config --system --edit # Set the default branch name when using git init. Here set to 'main'. git config --global init.defaultBranch main ``` - -## Beyond Compare -If you use [Beyond Compare](https://www.scootersoftware.com/), the following sets up Git to use it for diff and merge. - -```bash -git config --global diff.tool bc -git config --global difftool.bc.path "c:/Program Files/Beyond Compare 4/bcomp.exe" -git config --global merge.tool bc -git config --global mergetool.bc.path "c:/Program Files/Beyond Compare 4/bcomp.exe" -# This is up to the user on whether they want to keep .orig files. -git config --global mergetool.keepBackup false -```