Wiki source code of tortoisegit

Version 18.1 by Gideon Lombard on 2022/07/06 13:46

Hide last authors
Rudi Marais 1.1 1
2
Gideon Lombard 18.1 3 Install: [[https:~~/~~/download.tortoisegit.org/tgit/>>https://download.tortoisegit.org/tgit/]] and download the latest version
Rudi Marais 1.1 4
Gideon Lombard 18.1 5
6 [[image:1657115197554-401.png]]
7
Rudi Marais 2.1 8 = Defaults =
Rudi Marais 1.1 9
Gideon Lombard 14.1 10 [[image:1657110518542-869.png]]
11
12
13 [[image:1657110530030-642.png]]
14
15 [[image:1657110561627-201.png]]
16
17 [[image:1657110590445-522.png]]
18
Gideon Lombard 16.2 19
20 If you receive this message just select ignore and do the update step at the end.
21
Gideon Lombard 14.1 22 [[image:1657110612649-187.png]]
23
24
Gideon Lombard 16.2 25 [[image:1657110765365-816.png]]
Gideon Lombard 14.1 26
Gideon Lombard 16.2 27 [[image:1657110803212-629.png]]
28
29
30
Rudi Marais 3.1 31 * Show Whole Project = true
Rudi Marais 1.1 32
Rudi Marais 2.1 33 = Setup =
Rudi Marais 1.1 34
Rudi Marais 6.1 35 == ==
36
37 == Config ==
38
39 === Config VS Diff merge tool ===
40
41
42 Diff
43
44 [[image:image-20220412120648-1.jpeg]]
45
46 C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %base %mine
47
48
49 Merge
50
51 [[image:image-20220412120710-2.png]]
52
53
54 C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %theirs %mine %base %merged /m
55
Rudi Marais 2.1 56 == Cloning a repository ==
Rudi Marais 1.1 57
Rudi Marais 2.1 58 == Creating a branch ==
Rudi Marais 1.1 59
Rudi Marais 2.1 60 == Switching branches ==
Rudi Marais 1.1 61
Rudi Marais 2.1 62 == Merge Conflicts ==
63
Rudi Marais 1.1 64

Need help?

If you need help with XWiki you can contact: