averello/delta-mirror
1
0
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2026-02-03 11:33:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,074 Commits 83 Branches 64 Tags
git-diff-options-test
Commit Graph

47 Commits

Author SHA1 Message Date
martinml
0f8a2f0786 Only use nosort in bash <4.4 (#1683) 
* Only use `nosort` in bash <4.4

* Fix bad parameter order
 2024-05-10 13:05:29 -04:00
plustik
49a99180fe feat: generate completion subcommand (#1561) 
* generate-completion subcommand
* add Makefile target and replace completion scripts in repo with generated output
* Add completion to manual
 2023-11-19 10:20:52 -05:00
Fritz Rehde
dc692ea796 fixed typos (#1553) 2023-11-18 10:11:11 -05:00
Dan Davison
4597dc4c6b Bump versions 2023-06-02 19:08:43 -04:00
Dan Davison
956b2f4115 Explicitly request xz compression (#1249) 
* Explicitly request xz compression

Fixes #1248

* Do not insert a space between single-letter option and option value
 2022-12-03 15:17:47 -05:00
Witold Baryluk
b5ed58da71 Remove Provides in Debian package (#1217) 
Remove Provides in Debian package as this is incorrect usage of this flag.

To provide two versions of packages `Conflicts` as used is sufficient.

See Debian Policy Manual (v4.6.1.1) section 7.5

When at it Remove trailing dot in Description header to comply with section 5.6.13
Fixes: https://github.com/dandavison/delta/issues/1210
 2022-11-15 07:35:15 -05:00
Dan Davison
4e05ee5ef4 Check that new version number is present in docs 
Ref #1192
 2022-09-14 17:15:42 -04:00
exploide
df3ec7fa01 added auto completions for fish shell 2022-08-19 15:23:18 -04:00
Dan Davison
cf04dbc758 Bump version in files 2022-03-07 07:54:30 -05:00
Dan Davison
1403fe2b8e Use assets API from bat library instead of vendored code (#903) 
Use assets API from bat library

Fixes #895
Ref https://github.com/sharkdp/bat/issues/2026
Thanks @Enselic
 2022-02-27 12:08:23 -05:00
Dan Davison
6745f42dda Display merge conflicts 2021-12-05 11:25:05 -05:00
Dan Davison
e7294060ef Example diffs 2021-12-05 11:25:05 -05:00
Dan Davison
580a1e88ad Cthulhu commit diff 
2cde51fbd0
https://www.destroyallsoftware.com/blog/2017/the-biggest-and-weirdest-commits-in-linux-kernel-git-history
 2021-12-04 15:58:20 -05:00
Dan Davison
8a275c3617 Styles demo commit 
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)
 2021-11-28 18:28:22 -05:00
Dan Davison
b0eab4187e Initial file state 2021-11-28 18:28:22 -05:00
Dan Davison
4c23aaf5c3 Don't build and test in release Make target 2021-11-27 08:39:08 -05:00
Dan Davison
7d2ac30357 802 fix color moved side by side panic (#803) 
Append newline character when preparing raw line

Fixes #802
 2021-11-26 23:41:25 -05:00
Dan Davison
5dc0d6ef7e New option to map raw styles encountered in input 
Unify handling of styles parsed from raw line and computed diff
styles. This enables syntax highlighting to be used in color-moved
sections.

Fixes #72
 2021-11-23 19:30:36 -05:00
Dan Davison
3514c9e54c Don't use gren to generate release notes 2021-10-29 15:25:37 -04:00
Dan Davison
74147a7fab Update release Makefile 2021-10-26 20:51:20 -04:00
FnControlOption
40c004a6cf Update syntaxes and themes from bat v0.18.3 2021-10-26 13:27:31 -04:00
Dan Davison
d0c3fc52f8 Update diagnostics script 2021-09-30 18:45:15 -04:00
Dan Davison
5e02d340a8 662 submodule diffs (#699) 2021-08-22 11:25:39 -07:00
Dan Davison
be61273130 Compile delta from source in dockerfile 2021-08-20 10:19:55 -07:00
Dan Davison
362f75e5fb In the docker image: clone delta repo and install rust toolchain 2021-08-12 13:29:58 -07:00
Dan Davison
0541c5b3d8 Update Dockerfile 2021-08-12 11:47:59 -07:00
foamkeen
68296840fa Fix bash completion to include local files/dirs (#540) 
Co-authored-by: Maksim Fomkin <mfomkin@microsoft.com>
 2021-03-15 09:50:41 -05:00
Dan Davison
306238e9f8 Update themes from bat v0.18.0 2021-03-10 21:38:06 -05:00
Dan Davison
baec6d3afe Fix reference to non-existent target in Makefile 2021-02-05 09:31:36 -05:00
Dan Davison
11b98d4a40 Update release Makefile 2020-12-30 19:58:15 -05:00
Dan Davison
25a0dfcd6b Install less in Dockerfile 2020-12-24 11:24:43 +00:00
Dan Davison
59dae1f6f2 Dockerfile to install Delta under Ubuntu 2020-12-24 10:42:10 +00:00
Dan Davison
f501e23887 308 side by side tabs (#459) 
* Add #308 bug reproduction

delta --no-gitconfig --diff-highlight --side-by-side < etc/examples/308-side-by-side-tabs.diff

* Expand tabs under diff-highlight and diff-so-fancy

Fixes #308
 2020-12-23 13:03:34 +00:00
Dan Davison
4637403fc1 Delete public homebrew Makefile targets for release 2020-12-13 15:12:11 +00:00
Dan Davison
1a5959a6d3 Commit test examples 2020-12-05 23:24:39 +00:00
Marco Ieni
0ddd064819 delete travis ci (#418) 
Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>

Co-authored-by: Dan Davison <dandavison7@gmail.com>
 2020-12-03 16:19:09 -05:00
Marco Ieni
2cfc0aafa4 add cd (#417) 
Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
 2020-12-02 09:40:17 -05:00
Marco Ieni
2289337b0a ci: verify code is well formatted (#393) 
Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
 2020-11-22 11:26:21 -05:00
Michał Kiełbowicz
06e08b538b Add gruvbox light support (#369) 
* Add gruvbox light support

* Update binary assets from bat v0.16.0

Co-authored-by: Dan Davison <dandavison7@gmail.com>
 2020-10-28 18:17:07 -04:00
chris48s
9d89e4a92f debian packaging fixes (#301) 
* remove leading article from description

resolves description-synopsis-starts-with-article
https://lintian.debian.org/tags/description-synopsis-starts-with-article.html

* ensure copyright is mode 644

resolves non-standard-file-perm
https://lintian.debian.org/tags/non-standard-file-perm.html

* add Depends line

Use dpkg-shlibdeps to work out shared library dependencies
and include them in a "Depends:" line

resolves missing-depends-line
https://lintian.debian.org/tags/missing-depends-line.html

* remove duplicate LICENSE file

resolves extra-license-file
https://lintian.debian.org/tags/extra-license-file.html

* change docs dir name to match package name

i.e: docs go in
/usr/share/doc/git-delta
/usr/share/doc/git-delta-musl
etc

not /usr/share/doc/delta

* include years in copyright notice

This brings the copyright notice into line with the expected format
resolves copyright-without-copyright-notice
https://lintian.debian.org/tags/copyright-without-copyright-notice.html

* provide a multi-line description

resolves extended-description-is-empty
https://lintian.debian.org/tags/extended-description-is-empty.html
 2020-08-27 09:46:03 -04:00
Dan Davison
37522b4abd Fix Makefile 2020-08-08 14:11:04 -04:00
Dan Davison
18bae27ff3 Add unicode characters test to diagnostics script 2020-08-08 12:33:21 -04:00
Dan Davison
b075d32f25 Improve target name in Makefile 2020-08-08 12:26:42 -04:00
Dan Davison
aa1bb5c424 Shell scripts 2020-08-08 11:53:57 -04:00
Gavin Beatty
c9480cb7fe Add TARGET=aarch64-unknown-linux-gnu cross-compile (#279) 
* Add TARGET=aarch64-unknown-linux-gnu cross-compile

Assuming etc/ci/before_install.sh is already set up correctly, aarch64 may work now. Untested.

* aarch64 install libc cross & keep only gcc-4.8

* Fix aarch64 TARGET, CC_, CARGO_TARGET_ to match
 2020-08-08 11:53:40 -04:00
Dan Davison
4b690dc35e Pass --no-gitconfig in diagnostics script 2020-08-05 16:52:17 -04:00
Dan Davison
cfd6ed0e07 Reorganize 2020-08-05 16:37:09 -04:00