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

14672 Commits (ecaee577b23a68f47aded6d2ce07e30d31331149)
 

Author SHA1 Message Date
Amaan Qureshi 5c3ab3a9ef
chore: rename publish workflow 2024-04-05 08:52:57 +07:00
Amaan Qureshi a22761025c
chore: rename publish workflow 2024-04-05 08:52:41 +07:00
ObserverOfTime d33e20be29 ci: update workflows 2024-04-05 08:27:35 +07:00
Valentin Touzeau ff7f769c2d fix: correctly handle preproc alternatives 
This commit merges functions "elseBlock" and "elifBlock" in a single
function "alternativeBlock". Any call to either function is replaced by
a call to "alternativeBlock", which cover all alternatives (elif,
elifdef and else). The goal is twofold:

1) Correct the grammar to allow all kind of alternatives independently
   of the "if" directive. Before the fix, "#if" alternative was
   generated by elseBlock only, and thus disallow "#elifdef" as a
   follow-up.
2) As a side effect, simplify the parser.
 2024-04-04 20:56:39 +07:00
Amaan Qureshi d0b4e006ca
chore: generate 2024-04-04 15:29:35 +07:00
ObserverOfTime 8a64c2d6dd feat(scanner): use alloc header 2024-04-04 15:23:34 +07:00
ObserverOfTime 075886a9fb ci: update workflows 
and move eslint config to package.json
 2024-04-04 15:23:34 +07:00
ObserverOfTime dc564d2d32 build: update bindings 2024-04-04 15:23:34 +07:00
Wilfred Hughes db281c682c Roll version 2024-04-02 08:17:24 +07:00
Wilfred Hughes 00e837aeb1 Update changelog 2024-04-01 22:42:16 +07:00
Alexis (Poliorcetics) Bourget 573d607051 fix: diff hidden but non-ignored files when walking directories 2024-04-01 08:32:46 +07:00
Alexis (Poliorcetics) Bourget 1f79d16606 tests: show that hidden files are not picked up by difftastic 2024-04-01 08:32:46 +07:00
Pi-Cla 3b049c2fd0 run cargo update 2024-03-28 08:24:42 +07:00
Wilfred Hughes b3732b9ebb
Merge pull request #684 from mbaitelman/patch-1 
Update installation.md to include chocolatey
 2024-03-26 19:51:34 +07:00
mbaitelman d718d64a6e
Update installation.md to include chocolatey 2024-03-26 13:40:38 +07:00
Wilfred Hughes 415c591875
Merge pull request #638 from RBotfield/add-php-file-extensions 
Add extra PHP file extensions to the language guesser.
 2024-03-25 22:04:45 +07:00
Rhys Botfield e096444e73
Merge branch 'Wilfred:master' into add-php-file-extensions 2024-03-25 19:04:49 +07:00
Wilfred Hughes e34185f190 Consistent whitespace 2024-03-23 16:07:18 +07:00
Wilfred Hughes ca472bf0f1
Merge pull request #671 from matthewhughes934/add-tab-completion-for-git-alias 
Add tab completion for documented `dlog` alias
 2024-03-23 16:03:29 +07:00
Wilfred Hughes 5aeddd79d4 Add missing from_source manual page 2024-03-22 15:48:31 +07:00
Rhys Botfield e5e7d1cfb7 Format PHP extensions in guess_language.rs 
To keep rustfmt happy
 2024-03-22 21:32:25 +07:00
Wilfred Hughes caf8760deb
Merge pull request #672 from emaste/freebsd 
Add FreeBSD installation instructions
 2024-03-22 08:04:42 +07:00
Ed Maste 59d20674f4 Add FreeBSD installation instructions 2024-03-22 10:13:29 +07:00
Matthew Hughes f984413e6b Add tab completion for documented `dlog` alias 
There's a feature of Git's completion scripts that allows
completing function aliases[1]:

> If you use complex aliases of form '!f() { ... }; f', you can use the null
> command ':' as the first command in the function body to declare the desired
> completion style

This allows completion:

    $ git dlog --pat<tab>
    --patch             --patch-with-raw    --patch-with-stat   --patience

Tested on `bash`, though I believe this should also work with `zsh` and
`tsch` since their respective completion scripts also make use of the
`bash` one

[1] https://git.kernel.org/pub/scm/git/git.git/tree/contrib/completion/git-completion.bash?id=11c821f2f2a31e70fb5cc449f9a29401c333aad2#n26
 2024-03-22 08:20:56 +07:00
Wilfred Hughes dd7a0c87ee
Merge pull request #665 from opakapaka2003/opakapaka2003-patch-1 
Update installation.md
 2024-03-21 10:15:32 +07:00
opakapaka2003 47f63b28f0
Update installation.md 
Revise nix installation instructions to change "ripgrep" to "difftastic"
 2024-03-21 11:37:54 +07:00
Amaan Qureshi 72084f447c fix: crlf test 2024-03-20 20:53:10 +07:00
Wilfred Hughes c8655d23bd Trace git environment variables 2024-03-20 08:26:30 +07:00
Wilfred Hughes a70786d731 Expand installation instructions 
Include more installation commands, split out source installation to a
separate page.
 2024-03-19 08:47:27 +07:00
Wilfred Hughes 15977f6e25 Update to latest tree_magic_mini now PR was merged 2024-03-19 00:27:21 +07:00
Wilfred Hughes 3be8e80fe7 Fix issue with later lines not having positions during diffing 2024-03-19 00:25:18 +07:00
Wilfred Hughes 627ebc5a4c Revert "Upgrade to latest tree_magic_mini" 
This reverts commit b95c27a50a.
 2024-03-15 08:33:06 +07:00
Wilfred Hughes b95c27a50a Upgrade to latest tree_magic_mini 2024-03-14 22:33:00 +07:00
Wilfred Hughes 93ae0e91db Fix typos 2024-03-12 23:08:39 +07:00
Amaan Qureshi 371fd0bf06
docs: add pypi badge 2024-03-12 20:32:37 +07:00
Amaan Qureshi b125bec9b3
build: update makefile for macos installation 2024-03-12 20:06:23 +07:00
Amaan Qureshi b8a4c64121
build: update makefile for macos installation 2024-03-12 19:59:41 +07:00
Wilfred Hughes 3d29dc1228 Silence some clippy lints 2024-03-11 22:26:30 +07:00
ObserverOfTime a24dab177e feat: update bindings again 2024-03-11 11:40:44 +07:00
ObserverOfTime df3a42271c build: bump versions 
and change npm scope
 2024-03-11 11:40:44 +07:00
ObserverOfTime 393d7df945 ci: update workflows 2024-03-11 11:40:44 +07:00
ObserverOfTime 3fa47ca7aa feat: update bindings 2024-03-11 11:40:44 +07:00
ObserverOfTime 5712a1b2ce docs: update readme 2024-03-11 11:40:44 +07:00
ObserverOfTime 0f9047c857 build: update bindings and versions 2024-03-10 19:26:42 +07:00
ObserverOfTime bac818933c ci: update workflows 2024-03-10 19:26:42 +07:00
ObserverOfTime 70c0ddee61 ci: update workflows 2024-03-10 19:23:11 +07:00
ObserverOfTime db11e91889 build: update bindings and versions 2024-03-10 19:23:11 +07:00
Wilfred Hughes 34fa3d6eff Use a blank line after all diff summaries 2024-03-07 08:19:58 +07:00
Wilfred Hughes c6da85759c Consider null bytes in text file detection 2024-03-06 23:07:59 +07:00
Wilfred Hughes d3797ef4e2 Treat Scheme as a lisp in slider logic 2024-03-06 21:56:27 +07:00