Wiki source code of tortoisegit
Version 11.1 by Gideon Lombard on 2022/07/06 12:29
Hide last authors
| author | version | line-number | content |
|---|---|---|---|
 |
1.1 | 1 | |
| 2 | |||
| 3 | Install: [[https:~~/~~/download.tortoisegit.org/tgit/2.13.0.0/TortoiseGit-2.13.0.1-64bit.msi>>https://download.tortoisegit.org/tgit/2.13.0.0/TortoiseGit-2.13.0.1-64bit.msi]] | ||
| 4 | |||
| |
2.1 | 5 | = Defaults = |
| |
1.1 | 6 | |
| |
3.1 | 7 | * Show Whole Project = true |
| |
1.1 | 8 | |
| |
2.1 | 9 | = Setup = |
| |
1.1 | 10 | |
| |
6.1 | 11 | == == |
| 12 | |||
| 13 | == Config == | ||
| 14 | |||
| 15 | === Config VS Diff merge tool === | ||
| 16 | |||
| 17 | |||
| 18 | Diff | ||
| 19 | |||
| 20 | [[image:image-20220412120648-1.jpeg]] | ||
| 21 | |||
| 22 | C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %base %mine | ||
| 23 | |||
| 24 | |||
| 25 | Merge | ||
| 26 | |||
| 27 | [[image:image-20220412120710-2.png]] | ||
| 28 | |||
| 29 | |||
| 30 | C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %theirs %mine %base %merged /m | ||
| 31 | |||
| |
2.1 | 32 | == Cloning a repository == |
| |
1.1 | 33 | |
| |
2.1 | 34 | == Creating a branch == |
| |
1.1 | 35 | |
| |
2.1 | 36 | == Switching branches == |
| |
1.1 | 37 | |
| |
2.1 | 38 | == Merge Conflicts == |
| 39 | |||
| |
1.1 | 40 |