Title: Настройка git CSS: table.css

TOP

{{TOC}}

Настройка git

 git config --global user.email "name@host"
 git config --global user.name "user_name"

 git config --global color.status auto
 git config --global color.branch auto
 git config --global color.diff auto
 git config --global color.interactive auto
 git config --global push.default simple

 git config --global alias.lol "log --all --graph --decorate"
 git config --global alias.st "status --short --branch"

meld как difftool и mergetool

https://reangdblog.blogspot.com/2015/11/git-meld-5.html?ysclid=l7oakrn61400598641

[alias]
    df = difftool --dir-diff
    mt = mergetool -t meld
[diff]
    tool = meld
[difftool "meld"]
    cmd = meld $LOCAL $REMOTE
[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = true
    cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output="$MERGED"