about summary refs log tree commit diff stats
path: root/dev
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
parentfed632cea589a4fc730dc852538cb40ca6f559fa (diff)
parent947ffc14fd8f0987d094210659bbacc38c1637f5 (diff)
downloaddoc-e0a5c6deb7ca4845763083ae7b4f6901e36deefc.tar.gz
release 0.4.3
Diffstat (limited to 'dev')
-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,
182 183 184 185 186 187 188