about summary refs log tree commit diff stats
path: root/dev/git/index.html
diff options
context:
space:
mode:
authorSilvino Silva <silvino@bk.ru>2019-03-04 16:46:25 +0000
committerSilvino Silva <silvino@bk.ru>2019-03-04 16:46:25 +0000
commite0a5c6deb7ca4845763083ae7b4f6901e36deefc (patch)
treebaf772a443f48c3dfa6e7c88adc4f68cd82b1e4b /dev/git/index.html
parentfed632cea589a4fc730dc852538cb40ca6f559fa (diff)
parent947ffc14fd8f0987d094210659bbacc38c1637f5 (diff)
downloaddoc-e0a5c6deb7ca4845763083ae7b4f6901e36deefc.tar.gz
release 0.4.3
Diffstat (limited to 'dev/git/index.html')
-rw-r--r--dev/git/index.html12
1 files changed, 7 insertions, 5 deletions
diff --git a/dev/git/index.html b/dev/git/index.html
index e23e2a0..ed64efa 100644
--- a/dev/git/index.html
+++ b/dev/git/index.html
@@ -26,15 +26,19 @@
     <p>Paging based on output size with less;</p>
 
     <pre>
-    git config --global --replace-all core.pager "less -F -X"
+    $ git config --global core.pager "less -F -X"
     </pre>
 
-    <p>Example to disable for just one subcommand and local repository;</p>
+    <p>Use <a href="../../tools/vim.html#vimdiff">vimdiff</a> as diff and merge tool;</p>
 
     <pre>
-    $ git config pager.diff cat
+    $ git config --global diff.tool vimdiff
+    $ git config --global merge.tool vimdiff
+    $ git config --global difftool.prompt false
     </pre>
 
+    <h2 id="teamwork">1. Team WorkFlow</h2>
+
     <p>Assumptions of this document;</p>
 
     <ul>
@@ -57,8 +61,6 @@
        $ git remote -v
     </pre>
 
-    <h2 id="teamwork">1. Team WorkFlow</h2>
-
     <p>This work flow is based on
     <a href="http://nvie.com/posts/a-successful-git-branching-model/">Vicent Driessen</a>
     development model, it defines rules how branches are forked,
42' href='#n42'>42 43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156