Commit Graph

243 Commits

Author SHA1 Message Date
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
Dan Davison
df13f22534 Bump version in links to executables 2021-06-29 13:11:31 +01:00
Dan Davison
65485ca3ff Edit README 2021-06-28 08:16:48 +01:00
Dan Davison
f6d2a42a08 Edit README section concerning themes and color themes
Ref #646
2021-06-28 08:13:33 +01:00
Dan Davison
a4f5a4fa68 Bump version in documentation and private brew formula and bump dev version 2021-06-25 12:02:21 +01:00
Dan Davison
3bd2e98f88 Fix capitalization of "GitHub" in README 2021-06-23 04:07:00 +01:00
Andy Freeland
4034f4650a
Fix table of contents link (#620) 2021-05-30 21:32:49 -04:00
Dan Davison
1d30bee60e Edit README 2021-05-28 15:13:27 -04:00
Dan Davison
3beed3615a Update --help text in README 2021-05-28 15:04:26 -04:00
Dan Davison
1780bf24fd Bump version in links to executables 2021-05-28 14:59:20 -04:00
Dan Davison
9de714a8a9
Improve documentation of hyperlinks (#616) 2021-05-26 12:32:34 -04:00
Dan Davison
974204f897
Recommend setting delta as the pager for specific git commands (#610) 2021-05-26 09:30:22 -04:00
Dan Davison
6be96be6b9 Edit README 2021-05-24 19:50:11 -04:00
Dan Davison
56a69049cf Add git-split-diffs to similar projects section in README 2021-05-10 08:15:12 -04:00
Matt Ehlinger
2d6f53004a
docs: wrap link to ubuntu issue in link tag (#585) 2021-05-03 13:45:01 -04:00
Dan Davison
762ef0ccfe Add navigate to example config in README 2021-03-29 19:03:58 -04:00
Dan Davison
e4653cb090 Update README 2021-03-29 19:00:31 -04:00
Dan Davison
6b0848daca Add README note warning of problems on Debian/Ubuntu systems
Ref #504
2021-03-23 20:57:43 -04:00
Dan Davison
7a4be7e5c8 README tweak 2021-03-10 15:06:58 -05:00