dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-04 20:07:18 +03:00
Code Issues Projects Releases Wiki Activity
1,708 Commits 80 Branches 64 Tags 18 MiB
e5eea75eee
Commit Graph

261 Commits

Author SHA1 Message Date
An Yu
7eb56b0997 Clarify hyperlinks field 2021-12-07 13:05:11 -05:00
Dan Davison
034e6c64a0 Add @nkouevda's pdiff to the Similar Projects list 2021-12-06 18:16:14 -05:00
Dan Davison
a34eab9368 Bump version in links to executables 2021-12-06 14:00:46 -05:00
Dan Davison
0acbc475d6 Add a link to ARCHITECTURE.md 2021-12-05 22:53:51 -05:00
Dan Davison
517e3d8cbc Update README 2021-12-05 22:47:58 -05:00
Dan Davison
31b402a7ce Document merge conflict handling 2021-12-05 20:14:14 -05:00
Dan Davison
644e8089f7 README edits 2021-12-05 20:14:11 -05:00
Dan Davison
6745f42dda Display merge conflicts 2021-12-05 11:25:05 -05:00
Dan Davison
e887d691a4 README edit 2021-12-04 22:29:31 -05:00
Dan Davison
5b8ce8c182 Bump version in links to executables 2021-12-03 20:31:51 -05:00
Maxim Doucet
588145e49e Fix colorMoved in git config example 
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-30 17:43:17 -05:00
Maxim Doucet
7d01125e14 Fix navigate option in git config example 
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-30 17:23:49 -05:00
Dan Davison
063816cf7b README: Fix indentation 2021-11-30 11:35:07 -05:00
Dan Davison
4afae04919 README edits 2021-11-30 09:39:59 -05:00
Dan Davison
cf9ee14db3 Bump version in links to executables 2021-11-27 08:49:15 -05:00
Dan Davison
487425cd8e Update README to 0.10.1 2021-11-25 12:29:21 -05:00
Sandro
4393ab925b Add simpler colorMoved config snipped, add highlights to all codeblocks 2021-11-24 21:19:08 -05:00
Dan Davison
438290f0ff Document new color-moved functionality 2021-11-24 17:53:41 -05:00
Dan Davison
70e3c0e318 Revert recommended configuration to core.pager = delta 2021-11-24 17:53:22 -05:00
Wayne Davison
0c0043b428
Navigate regexp (#782) 
* Allow navigate-regexp value to be overridden.

* Don't add an empty label to the navigate_regexp.

* Make --hunk-label=str not require --navigate.

* Change navigate regexp to navigate regex.

* Turn navigate-regex into an Option<String>.
 2021-11-22 20:19:23 -05:00
Dan Davison
07892bc572 Handle grep output 
- Handle standard filepath:code and filepath:line_number:code output
  as produced by `git grep`, `rg -H`, `grep -H`, etc (with -n for line
  numbers).

- Retain the match highlighting as produced by the grep tool, and
  expose it in delta's color output styled with grep-match-style.
  (Note that --color=always is needed to retain the color if piping
  into delta, but not for `git grep` when delta is configured as git's
  pager)

- Special handling of -p, and -W options of `git grep`: these display
  the function context in which the matches occur.

- `navigate` keybindings jump between match function contexts under
  `git grep -p` and between matching lines under `git grep -W`.

Thanks @zachriggle for the proposal.
Fixes #769
 2021-11-22 13:18:15 -05:00
Wayne Davison
90fd9c6049 Add the --right-arrow option. 
This allows the file1 -> file2 arrow to be configured to whatever
characters the user desires.  The default is the same unicode arrow as
before with 2 spaces after it, since this allows someone to remove the
extra spaces that are in the current output.
 2021-11-17 13:42:20 -05:00
Dan Davison
d46a1741f7 Update blame docs 2021-11-15 22:43:14 -05:00
Dan Davison
90232841de Update blame documentation 2021-11-15 22:39:42 -05:00
Dan Davison
24a07ff947 Handle git blame output 
Fixes #426

Partial versions of these changes were previously in master and then
reverted multiple times.

See #746
0745f853d4
3aab5d1956
 2021-11-15 21:01:32 -05:00
Dan Davison
d083953403 README edit 2021-11-15 10:22:17 -05:00
Dan Davison
986ebe023e Update README ToC 2021-11-15 10:17:24 -05:00
Dan Davison
ba44607022 Doc: explain invocation of delta by git 2021-11-15 10:14:10 -05:00
Dan Davison
00768743df Markdown autoformatting 2021-11-15 10:13:50 -05:00
Kriss
9d0d7f0fa5
[README] add notes for screen (256color/24bit) (#768) 
Ref.: https://github.com/dandavison/delta/issues/760
 2021-11-07 13:10:22 -05:00
Dan Davison
3c87160f2c README: minor edits 2021-11-07 10:38:09 -05:00
Kriss
9a6f7d3eff
replace link to XVilka's gist with the updated one (#764) 
To ease collaboration,  XVilka has decided to relocate  their gist to an
actual Github repository  a while ago,  in oder to facilitate  contribu-
tions.

Ref: https://gist.github.com/XVilka/8346728#gistcomment-3836228 ff.
 2021-11-05 15:40:00 -04:00
Dan Davison
923719a75a README: remove spurious feature in example config 2021-11-01 18:09:33 -04:00
Dan Davison
081eb60299 Add screenshot of side-by-side with wrapping 2021-10-27 08:32:06 -04:00
Dan Davison
f19524b0b5 Bump version in links to executables 2021-10-26 20:51:12 -04:00
Dan Davison
0b8d2f32d3 README edits 2021-10-26 20:23:47 -04:00
Dan Davison
e7513937df Update README 2021-10-26 20:10:18 -04:00
Dan Davison
5ff90b0d41 Document side-by-side line wrapping in README 2021-10-25 18:52:25 -04:00
Dan Davison
73270b62e1 Fix TOC characters 2021-09-27 16:30:25 -04:00
Dan Davison
b203d94f0d README simplification 2021-09-27 16:26:57 -04:00
Dan Davison
ef92f3f646 Change example config in README 
- Use `keep-plus-minus-markers = false` for `git add -p`
- Otherwise resemble "hoopoe" theme
 2021-07-28 19:56:22 +01:00
Dan Davison
7839a36158 Bump version in links to executables 2021-07-13 16:12:27 +01:00
Axel Navarro
2da444a195
README: add links to Linux and macOS packages (#655) 2021-07-08 14:26:26 +01:00
Dan Davison
b6d221cee2 Link to glibc- and musl-linked executables from README 2021-07-08 12:25:46 +01:00
Dan Davison
284673277f Reformat README installation section 2021-07-08 12:21:14 +01:00
Dan Davison
2edeb3712e More clean-up of installation section in README 2021-07-08 12:03:29 +01:00
Dan Davison
1fb4ec4980 Add link to Arch Linux package package 
Ref https://github.com/dandavison/delta/pull/653
 2021-07-08 11:54:20 +01:00
Dan Davison
79bc360afa Clean up package managers section in README 2021-07-08 11:46:20 +01:00
Axel Navarro
281f479b09
Update README using Arch Linux official packages (#654) 2021-07-08 11:37:38 +01:00
Dan Davison
04c3ffd8ea Update help text in README 2021-06-29 15:28:52 +01:00