sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,628 Commits
43 Branches
77 Tags
1.9 GiB
Commit Graph

123 Commits (d9d6513c425a3ee64a757bd5eb2e716c36d6fdfd)

Author SHA1 Message Date
Wilfred Hughes fcd5e1eec5 Link mergiraf in both sections discussing merging 2025-08-10 15:12:30 +07:00
Wilfred Hughes 149c040c45 Prefer 'line-oriented diff' terminology 
'Text diff' is confusing as the input files to difftastic's structural
diffing logic is also text. Line-oriented more accurately captures the
important aspect.
 2025-04-28 09:05:11 +07:00
Wilfred Hughes eff3e16cad Document parse error behaviour and recommendations 
Closes #815
 2025-04-09 22:23:26 +07:00
Wilfred Hughes b8383e191a Mention difftastic.el 
Closes #808
 2025-03-22 15:45:31 +07:00
Wilfred Hughes 45e5cd8157 Mention mergiraf 2024-11-26 01:41:46 +07:00
Wilfred Hughes 5ad8b1bb31 Document the usage of bright colours and Solarized 
See #745 and #611
 2024-07-30 15:02:09 +07:00
Wilfred Hughes f1bd870382 Document how difftastic handles unordered syntax 
Closes #723
 2024-07-08 23:41:58 +07:00
Wilfred Hughes 11e2c49b7e Fix wording 2024-05-13 16:32:45 +07:00
Manuel 5ade0bbe9c readme: direct link to languages section 2024-04-25 07:23:49 +07:00
Wilfred Hughes 3a480154c2 Use consistent casing 2024-03-06 21:47:30 +07:00
Wilfred Hughes e208720d64 Describe how difftastic works in FAQ 2024-03-06 21:41:58 +07:00
Wilfred Hughes 35c1b4171f Update link to manual 2024-01-05 21:08:33 +07:00
Wilfred Hughes a87ca9dd87 Mention merge conflicts in FAQ 2023-08-15 23:00:43 +07:00
Wilfred Hughes c6be0bc16a Mention --check-only in the FAQ 2023-08-13 23:08:06 +07:00
Wilfred Hughes 9ce60140ce Update screenshot and ensure sample files match 2023-01-22 20:19:36 +07:00
Wilfred Hughes 08b3ff138f Rename vendor/ directory 
Closes #453
 2023-01-10 08:35:01 +07:00
Arialdo Martini bad57dbac5
20 known languages => 30 2022-10-01 22:33:32 +07:00
Wilfred Hughes 693b4c9e19 Consistent badge text 2022-09-28 23:21:47 +07:00
Wilfred Hughes f8c2258024 Make manual translation more prominent 2022-09-28 23:21:11 +07:00
Yeegsing c380ecff48 update the rest of the translation 2022-09-12 08:04:36 +07:00
eric.tao 325f20e336 chinese translation of README.md 2022-09-07 20:19:58 +07:00
Wilfred Hughes d69cc05966 Add link to magit blog post 
Mentioned in #251
 2022-08-17 09:41:54 +07:00
Wilfred Hughes 43a03d2939 Tweak slogan to clarify that difftastic understands structure 
"Understands syntax" is sometimes confused with syntax highlighting.
 2022-05-23 23:39:15 +07:00
Wilfred Hughes 2b901d5de2 Clarify parser licenses 2022-04-23 11:38:30 +07:00
Wilfred Hughes 12bc7f7de4 Tweak readme wording 2022-04-14 21:46:51 +07:00
Wilfred Hughes 18b1204b3a Rename Getting Started to Installation in the manual 2022-04-14 21:26:36 +07:00
Wilfred Hughes 1f2d8bd7ab Add FAQ 2022-04-07 09:31:32 +07:00
Wilfred Hughes e9992a60f4 Clarify the limitations of patch files 
See also #186.
 2022-04-01 09:38:08 +07:00
Wilfred Hughes c4c05fdde5 Prefer a single language list, in the manual 
It's easy for these to get out of sync.
 2022-03-30 22:50:17 +07:00
Wilfred Hughes ce076a142b Tweak formatting in README 
Half the sentence being bold looks untidy.
 2022-03-30 20:54:37 +07:00
Wilfred Hughes 5116c69afe Make installation instructions more prominent 2022-03-29 23:22:33 +07:00
Wilfred Hughes ecdf993ff1 Add support for Nix 
Closes #196
 2022-03-29 22:46:09 +07:00
Jafar eb29b824c3
Merge branch 'master' into pr-add_lua_parser 2022-03-30 06:23:20 +07:00
JafarAbdi b850d41fa5 Add lua support 2022-03-30 06:21:10 +07:00
Wilfred Hughes 646ab39cbb Mention that Janet is supported 2022-03-29 19:50:25 +07:00
Wilfred Hughes 065a11ee2c Clarify textual diffing approach 2022-03-27 18:43:31 +07:00
Wilfred Hughes c15ba1e75a New screenshots and add screencast demo 2022-03-26 15:46:41 +07:00
Ömer Sinan Ağacan a2488f984c Add support for Dart 2022-03-20 11:07:32 +07:00
Wilfred Hughes 3dc193ed0c Tweak badge styles 2022-03-19 12:44:42 +07:00
Wilfred Hughes 0379b49109 Clarify non-goals 2022-03-17 22:41:47 +07:00
Wilfred Hughes ed0bde6b91 Adding support for PHP 2022-03-09 23:52:31 +07:00
Wilfred Hughes 0fb5525902 Tweak wording of motto 2022-02-28 21:03:07 +07:00
Wilfred Hughes 82890923cd Track entering/leaving parents explicitly 
This produces significantly better diffs, and fixes some cases that
were outright wrong before.

Fixes #30
 2022-02-20 12:43:52 +07:00
Wilfred Hughes c2cfd09863 Put manual first in readme buttons 2022-02-17 00:13:49 +07:00
Wilfred Hughes 7291900b56 Remove Hack parser 
Waiting on upstream to merge my changes first.
 2022-02-07 21:43:37 +07:00
Wilfred Hughes 43605bd5e8 Add support for Hack 2022-02-02 23:22:15 +07:00
Wilfred Hughes 2f3db76bf8 Integration is adequate now 
Git and Mercurial support is sufficient for most use cases, although
other git clients (e.g. magit) have no support yet.
 2022-01-30 22:59:49 +07:00
Wilfred Hughes 2ecbfb5676 Update screenshots to show new syntax highlighting 2022-01-29 17:54:36 +07:00
Hugo van Rijswijk cc651ad14a
Add Scala support 2022-01-18 12:53:02 +07:00
Wilfred Hughes 74a0662a91 Polish wording of README 2022-01-16 20:28:18 +07:00