diff options
Diffstat (limited to 'dev/git')
| -rw-r--r-- | dev/git/index.html | 12 |
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, |