summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2021-12-06Don't inspect calling processes824-slowness-investigationDan Davison
2021-12-05Add a link to ARCHITECTURE.mdDan Davison
2021-12-05Update READMEDan Davison
2021-12-05Bump version in private Homebrew formulaDan Davison
2021-12-05Document merge conflict handling0.11.0Dan Davison
2021-12-05README editsDan Davison
2021-12-05Bump versionDan Davison
2021-12-05Gracefully handle failure to parse hunk headerDan Davison
Fixes #765
2021-12-05Failing test for #765Dan Davison
2021-12-05Do not truncate hunk header lineDan Davison
Fixes #813
2021-12-05Add test of parsing cthulhu commit hunk headerDan Davison
Ref #813
2021-12-05Bug fix: fix panic in merge conflict `diff -U0`Dan Davison
2021-12-05Add InMergeConflict to combined diff enum variantDan Davison
This allows keep-plus-minus-markers=false to be honored inside merge conflicts but not honored for combined diff regions outside merge conflicts.
2021-12-05Display merge conflictsDan Davison
2021-12-05Example diffsDan Davison
2021-12-05Refactor: paint_minus_and_plus_lines functionDan Davison
2021-12-05Handle combined diff formatDan Davison
With this commit combined diff format (https://git-scm.com/docs/git-diff#_combined_diff_format) is handled appropriately. However, there is no special handling of merge conflict markers. Fixes #189, #736
2021-12-05Fix blame background colorsDan Davison
These had been broken by ec08c4de76ff26046a0cebc70a54f5c42fbfb835
2021-12-05PERF: Add commentDan Davison
2021-12-04Silence warningDan Davison
2021-12-04README editDan Davison
2021-12-04Fix weird but correct line handlingDan Davison
This handler function was returning `false`, thus signaling that it had not handled the line, when it was not the responsibility of any other handler to handle the line. It was doing this to rely on the fall-through handlers determining whether to emit the line or skip it. But this risks another handler handling it and is a violation of the contract. It is much more appropriate to make the determination in the handler itself, emit it if appropriate, and signal that it has been handled.
2021-12-04Cthulhu commit diffDan Davison
https://github.com/torvalds/linux/commit/2cde51fbd0f310c8a2c5f977e665c0ac3945b46d https://www.destroyallsoftware.com/blog/2017/the-biggest-and-weirdest-commits-in-linux-kernel-git-history
2021-12-03Bump version in links to executablesDan Davison
2021-12-03Bump version in private Homebrew formulaDan Davison
2021-12-02Fix new v1.57 clippy warnings0.10.3Thomas Otto
2021-12-02Fix side-by-side line number miscountThomas Otto
2021-11-30[themes.gitconfig] add woolly-mammoth blame configKr1ss
2021-11-30Fix colorMoved in git config exampleMaxim Doucet
According to [git documentation for diff.colorMoved](https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---color-movedltmodegt), `true` is not a correct value. `default` is a correct value and it also matches the "`--color-moved` support" section of this README.
2021-11-30Fix navigate option in git config exampleMaxim Doucet
The navigate option does not work when present in the `[core]` section of the git config because it is not a git option. It works correctly when present in the `[delta]` section.
2021-11-30README: Fix indentationDan Davison
2021-11-30README editsDan Davison
2021-11-29Refactor: `if let` instead of `match`Dan Davison
2021-11-29Rename: FileMeta => DiffHeaderDan Davison
2021-11-29Initial version of ARCHITECTURE.mdDan Davison
2021-11-29Do not handle --word-diff or --color-words outputDan Davison
Fixes #440 Ref #152
2021-11-29Refactor: is_in_hunkDan Davison
2021-11-29Refactor: parse command lineDan Davison
2021-11-29Test sibling process detectionThomas Otto
2021-11-29Match process binary case insensitivelyThomas Otto
2021-11-29Clean up FakeParentArgsThomas Otto
Can fake once, for_scope, or with a given list.
2021-11-28Revert "Refactor: rewrite superimpose_styles function (#804)"Dan Davison
This reverts commit 3e21f00765794f7a4e955826a1612b49f1723bfd. Fixes #810
2021-11-28Bump versionDan Davison
2021-11-28808 honor raw blame styles (#809)Dan Davison
* Honor raw blame styles Fixes #808 * Honor map-styles * Comments
2021-11-28Fix right fill style on color-moved linesDan Davison
Bug introduced at 7d2ac303573a444ec3e98657bd0bd6d11f562b21
2021-11-28Do not fill entirely new/removed lines with non-emph styleDan Davison
2021-11-28Refactor: hunk style sections handlingDan Davison
- Factor out a new function update_diff_style_sections - Use MinusPlus construct more
2021-11-28Always use non-emph style for right fillDan Davison
2021-11-28Change rules for non-emph styleDan Davison
Fixes #776 Previously, when a paired plus line had no edits, it received plus-style. With this commit such a line receives plus-non-emph-style. There's no change to unpaired lines (still plus-style) and paired lines with edits (still a mosaic of plus-non-emph-style and plus-emph-style). (The above statements hold for minus lines also). Since *-non-emph-style defaults to *-emph-style, this commit does not result in any change in output for users using the defaults.
2021-11-28Styles demo commitDan Davison
The diff in this commit contains sections with all of the following semantics: minus-style (old line 1) plus-style (new line 1) zero-style (line 2) minus-non-emph-style (old line 4, and unchanged sections of old line 3) minus-emph-style (deleted word "chaffinch" in old line 3) plus-non-emph-style (new line 3, and unchanged sections of new line 4) plus-emph-style (added word "dodo" of new line 4)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 01:46:57 +0000