Wiki source code of tortoisegit
Version 14.1 by Gideon Lombard on 2022/07/06 12:31
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 | |
| |
14.1 | 7 | [[image:1657110518542-869.png]] |
| 8 | |||
| 9 | |||
| 10 | [[image:1657110530030-642.png]] | ||
| 11 | |||
| 12 | [[image:1657110561627-201.png]] | ||
| 13 | |||
| 14 | [[image:1657110590445-522.png]] | ||
| 15 | |||
| 16 | [[image:1657110612649-187.png]] | ||
| 17 | |||
| 18 | |||
| 19 | |||
| |
3.1 | 20 | * Show Whole Project = true |
| |
1.1 | 21 | |
| |
2.1 | 22 | = Setup = |
| |
1.1 | 23 | |
| |
6.1 | 24 | == == |
| 25 | |||
| 26 | == Config == | ||
| 27 | |||
| 28 | === Config VS Diff merge tool === | ||
| 29 | |||
| 30 | |||
| 31 | Diff | ||
| 32 | |||
| 33 | [[image:image-20220412120648-1.jpeg]] | ||
| 34 | |||
| 35 | C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %base %mine | ||
| 36 | |||
| 37 | |||
| 38 | Merge | ||
| 39 | |||
| 40 | [[image:image-20220412120710-2.png]] | ||
| 41 | |||
| 42 | |||
| 43 | C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %theirs %mine %base %merged /m | ||
| 44 | |||
| |
2.1 | 45 | == Cloning a repository == |
| |
1.1 | 46 | |
| |
2.1 | 47 | == Creating a branch == |
| |
1.1 | 48 | |
| |
2.1 | 49 | == Switching branches == |
| |
1.1 | 50 | |
| |
2.1 | 51 | == Merge Conflicts == |
| 52 | |||
| |
1.1 | 53 |