| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Fixes #765
|
|
|
|
With this commit combined diff
format (https://git-scm.com/docs/git-diff#_combined_diff_format) is
handled appropriately. However, there is no special handling of merge
conflict markers.
Fixes #189, #736
|
|
|
|
|
|
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
|
|
* 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>.
|
|
- 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
|
|
|
|
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.
|
|
|
|
Fixes #426
Partial versions of these changes were previously in master and then
reverted multiple times.
See #746
0745f853d4bed52aca0b6739ac452d54ff54a153
3aab5d19569fa52ace2d7e6d196a1256990c4e20
|
|
|
|
This should have been done in 0745f853d4bed52aca0b6739ac452d54ff54a153
and the command line options were therefore incorrectly released in
0.9.0.
|
|
Make the two panels in side-by-side use the full terminal width by
inserting an extra space in the center between the panels if the
width is odd and ANSI filling is enabled.
Fall back to spaces when the output is not to a terminal.
|
|
|
|
* Fix two typos
* Dismantle two Pyramids of Doom
Use question mark operator instead
* Use fatal() to exit with errorcode 2
|
|
|
|
|
|
|
|
If the current line does not fit into the panel, then
it is not truncated but split into multiple lines. A
wrapping symbol is placed at the end of the line. If
the new line is short enough, it is right-aligned.
Wrapping is limited to a certain number of lines
(--wrap-max-lines), if this is exceeded the line is
truncated by a now highlighted truncation symbol.
To disable wrapping set this value to 0.
|
|
Panic when testing or exit with return value 2.
|
|
In side-by-side mode, if `background_color_extends_to_terminal_width`
is set, the left panel color is extended via spaces, but the right
one via an ANSI sequence which instructs the terminal emulator to
fill the background color rightwards.
The command line option --line-fill-method ansi|spaces can change
how the right panel background is filled.
Add enums `BgShouldFill` and `BgFillMethod` to better distinguish
if the background should be filled, and if so, how.
|
|
Can be indexed with Minus/Plus or in a side-by-side context
with Left/Right to represent the left/right Panels.
|
|
|
|
Fixes #291, #426
|
|
|
|
* Rename state machine state: Submodule -> SubmoduleLog
* More minimalistic display of submodule log diffs
Partially fixes #662
* Defer emitting hunk header until first true hunk line
A consequence is that we do not emit the (pseudo) hunk header in
submodule (short) state; see #662.
|
|
|
|
|
|
* Use distinct navigate label for file and hunk boundaries
Ref #680
* Make it easy to remove hunk label from navigate regex
Thanks @lepotic for the suggestion.
Fixes #680
* Allow regex meta characters to be used in navigate anchors
|
|
* Make truecolor option honorable from gitconfig
* Add test that true-color can be read from git config
The new test fails before 7ed3c2c3ee494dab25fd76b220da7c716a9b731f
* Place computing process after set_options
* Add test for checking if values requre computing set correctly
* Remove unnecessary computed values candidate
Co-authored-by: Dan Davison <dandavison7@gmail.com>
|
|
* Add pager option
* Use config.pager for output
|
|
* Refactor: hyperlinks utility
* Add hyperlinks-commit-link-format option
Fixes #613
|
|
Fixes #174
|
|
|
|
|
|
Fixes #552
|
|
|
|
|
|
|
|
Fixes #481
|
|
|
|
all (#296)"
This reverts commit ecb2da1e271aa0daa6dd2ed4c6658d59347020e6.
|
|
Fixes #309
|
|
Fixes #448
|
|
* Add config property of color_only
* Delete force assign raw to file_style when color_only
* Print filemeta in color with rawline when color_only mode
* Cargo fmt
* Add test if file_style with color_only has style
* Add comment about color_only
|
|
Fixes #427
|
|
Fixes #392
|
