What is `git diff –patience` for?

by

You can read a post from Bram Cohen, the author of the patience diff algorithm, but I found this blog post to summarize the patience diff algorithm very well:

Patience Diff, instead, focuses its energy on the low-frequency high-content lines which serve as markers or signatures of important content in the text. It is still an LCS-based diff at its core, but with an important difference, as it only considers the longest common subsequence of the signature lines:

Find all lines which occur exactly once on both sides, then do longest common subsequence on those lines, matching them up.

When should you use patience diff? According to Bram, patience diff is good for this situation:

The really bad cases are ones where two versions have diverged
dramatically and the developer isn’t being careful to keep patch sizes
under control. Under those circumstances a diff algorithm can occasionally
become ‘misaligned’ in that it matches long sections of curly brackets
together, but it winds up correlating the curly brackets of functions in
one version with the curly brackets of the next later function in the
other version. This situation is very ugly, and can result in a totally
unusable conflict file in the situation where you need such things to be
presented coherently the most.

More Related Contents:

  1. How can I see the changes in a Git commit?
  2. How to grep (search) committed code in the Git history
  3. How do I view ‘git diff’ output with my preferred diff tool/ viewer?
  4. How to compare a local Git branch with its remote branch
  5. How to read the output from git diff?
  6. Can I make git recognize a UTF-16 file as text?
  7. git-diff to ignore ^M
  8. Can I use git diff on untracked files?
  9. How to see the changes between two commits without commits in-between?
  10. Filter git diff by type of change
  11. use Winmerge inside of Git to file diff
  12. In the context of git (and diff), what is a “hunk”
  13. Where does the excerpt in the git diff hunk header come from?
  14. What does “@@ -1 +1 @@” mean in Git’s diff output?
  15. Git: How can I find a commit that most closely matches a directory?
  16. diff returning entire file for identical files
  17. Git Diff of same files in two directories always result in “renamed”
  18. How resolve multiple conflicts with “git mergetool” without having to close the editor between files?
  19. What does the “@@…@@” meta line with at signs in svn diff or git diff mean?
  20. How can I get a git submodule’s associated commit ID from a past commit in the parent clone?
  21. Viewing all `git diffs` with vimdiff
  22. View differences of branches with meld?
  23. How can I visualize per-character differences in a unified diff file?
  24. How to apply `git diff` patch without Git installed?
  25. ‘git status’ shows changed files, but ‘git diff’ doesn’t
  26. Highlight changed lines and changed bytes in each changed line
  27. Show both staged & working tree in git diff?
  28. Show git diff, ignoring file permission changes?
  29. How to perform a three-way diff in Git without merging?
  30. Using git diff, how can I get added and modified lines numbers?

Leave a Comment