configs  Check-in [37f5866f0b]

Overview
Comment:fld.fish: Fallback for when colordiff is missing
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 37f5866f0bfcf9c581c8b04b240aada69e9c8d79ab12469b2b776cb6873660ab
User & Date: js 2020-08-18 21:16:48
Context
2020-08-18
21:20
Add flgrep.fish check-in: 4c9e4c1a37 user: js tags: trunk
21:16
fld.fish: Fallback for when colordiff is missing check-in: 37f5866f0b user: js tags: trunk
2020-08-15
15:52
Only apply flgrep to current directory & children check-in: ca12553441 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to fish/functions/fld.fish. 

1

2







3

function fld --wraps 'fossil diff'

    command fossil diff $argv -N | colordiff | less -FRX







end


>
|
>
>
>
>
>
>
>


1
2
3
4
5
6
7
8
9
10
11

function fld --wraps 'fossil diff'
    if type -q colordiff2
        command fossil diff -N $argv | colordiff | less -FRX
    else
        set -l red (tput setaf 1)
        set -l green (tput setaf 2)
        set -l reset (tput sgr0)
        fossil diff -N $argv | sed "s/^+.*\$/$green&$reset/" |
            sed "s/^-.*\$/$red&$reset/" | less -FRX
    end
end

Changes to git/config.

︙︙
31
32
33
34
35
36
37




[url "git@github.com:"]
	insteadOf = https://github.com/
	pushInsteadOf = https://github.com/

[fetch]
	fsckObjects = true










>
>

31
32
33
34
35
36
37
38
39


[url "git@github.com:"]
	insteadOf = https://github.com/
	pushInsteadOf = https://github.com/

[fetch]
	fsckObjects = true
[pull]
	ff = only