Move Beyond Compare settings to a new page
This commit is contained in:
parent
7a287704ce
commit
9689ec21a2
|
@ -9,6 +9,7 @@
|
||||||
* [User information](configuration/user.md)
|
* [User information](configuration/user.md)
|
||||||
* [Git configuration](configuration/git.md)
|
* [Git configuration](configuration/git.md)
|
||||||
* [Repository information](configuration/repository.md)
|
* [Repository information](configuration/repository.md)
|
||||||
|
* [Beyond Compare configuration](configuration/beyond-compare.md)
|
||||||
* [Commits](commits.md)
|
* [Commits](commits.md)
|
||||||
* [Fixing commits](commits/fixing.md)
|
* [Fixing commits](commits/fixing.md)
|
||||||
* [Stashing](stashing.md)
|
* [Stashing](stashing.md)
|
||||||
|
|
|
@ -4,3 +4,4 @@ The following sections covers general configuration and information.
|
||||||
* [User information](configuration/user.md)
|
* [User information](configuration/user.md)
|
||||||
* [Git configuration](configuration/git.md)
|
* [Git configuration](configuration/git.md)
|
||||||
* [Repository information](configuration/repository.md)
|
* [Repository information](configuration/repository.md)
|
||||||
|
* [Beyond Compare configuration](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
|
||||||
|
```
|
|
@ -12,15 +12,3 @@ git config --system --edit
|
||||||
# Set the default branch name when using git init. Here set to 'main'.
|
# Set the default branch name when using git init. Here set to 'main'.
|
||||||
git config --global init.defaultBranch 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
|
|
||||||
```
|
|
||||||
|
|
Loading…
Reference in New Issue