1. Compares and merges 2 or 3 files or directories. The file diff shows changes within each line. For Unix and for Windows. Source available under GPL.

  2. Git详解之三:Git分支 - 文章 - 伯乐在线

    原文:《Pro Git》 Git 分支 几乎每一种版本控制系统都以某种形式支持分支。使用分支意味着你可以从开发主线上分离开来,然后在不影响主线的同时继续工作。

  3. Git Conflict Resolution. By Ted Felix Mar 15, 2016. The conflict resolution process in git is slightly different for each git command. This tutorial will walk you ...

  4. Download KDiff3 for free. A graphical text difference analyzer. KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by ...

  5. Is there a good way to explain how to resolve merge conflicts in Git?

  6. This tutorial explains the usage of the distributed version control system Git via the command line. The examples were done on Linux (Ubuntu), but should also work on ...

  7. UPDATE!!! I’m now using an easier way of configuring diff and merge tools. If you don’t mind using KDiff3 then you might want to check …

  8. I've tried msysGit and Git on Cygwin. Both work just fine in and of themselves and both run gitk and git-gui perfectly. Now how the heck do I configure a mergetool?

  9. The git config command is a convenience function that is used to set Git configuration values on a global or local project level.

    https://www.atlassian.com/.../setting-up-a-repository/git-config2 天前
  10. SourceTree Changes. SRCTREEWIN-7346 Avoid crashes as startup by adding more resilience to calculating starting window position, size and state.