git.md (928B)
1 Title: Настройка git 2 CSS: table.css 3 4 [TOP](index) 5 6 {{TOC}} 7 8 # Настройка git 9 10 11 ``` 12 git config --global user.email "name@host" 13 git config --global user.name "user_name" 14 15 git config --global color.status auto 16 git config --global color.branch auto 17 git config --global color.diff auto 18 git config --global color.interactive auto 19 git config --global push.default simple 20 21 git config --global alias.lol "log --all --graph --decorate" 22 git config --global alias.st "status --short --branch" 23 ``` 24 25 # meld как difftool и mergetool 26 27 https://reangdblog.blogspot.com/2015/11/git-meld-5.html?ysclid=l7oakrn61400598641 28 29 ``` 30 [alias] 31 df = difftool --dir-diff 32 mt = mergetool -t meld 33 [diff] 34 tool = meld 35 [difftool "meld"] 36 cmd = meld $LOCAL $REMOTE 37 [merge] 38 tool = meld 39 [mergetool "meld"] 40 prompt = false 41 keepBackup = true 42 cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output="$MERGED" 43 ```