heavy/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Projects 1 Wiki Activity

Added p4merge as mergetool in git config (only if OS is windows).

Browse Source
This commit is contained in:
Stefan Gaiselmann 2021-02-13 10:40:12 +01:00
parent 1f4657d7c7
commit 08721fbe71
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dot_gitconfig.tmpl
View File

@ -48,23 +48,41 @@
# from pixelbeat # from pixelbeat
brdate = for-each-ref --sort=-committerdate --format='%(committerdate:iso8601) %(refname:short)' refs/heads/ brdate = for-each-ref --sort=-committerdate --format='%(committerdate:iso8601) %(refname:short)' refs/heads/
st = stash list --date=local st = stash list --date=local
alias = ! git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e s/\\ /\\ =\\ / alias = ! git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e s/\\ /\\ =\\ /
d = diff -w d = diff -w
dc = diff -w --cached dc = diff -w --cached
# from https://www.toptal.com/developers/gitignore # from https://www.toptal.com/developers/gitignore
# create .gitignore templates based on operationg systems, IDE, languages etc. # create .gitignore templates based on operationg systems, IDE, languages etc.
ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi" ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"
[core] [core]
editor = vim editor = vim
[push] [push]
# default = matching # default = matching
default = simple # safer option, push only current branch default = simple # safer option, push only current branch
[pull]
ff = only
{{ if eq .chezmoi.os "windows" -}}
[merge] [merge]
tool = p4merge tool = p4merge
ff = false ff = false
[pull]
ff = only [mergetool "p4merge"]
path = "C:\\Program Files\\Perforce\\p4merge.exe"
cmd = p4merge $BASE $LOCAL $REMOTE $MERGED
keepBackup = false
[difftool "p4merge"]
external = p4merge $LOCAL $REMOTE
[difftool "winmerge"]
cmd = "'c:/PortableApps/PortableApps/WinMergePortable/App/WinMerge/WinMergeU'" -e "$LOCAL" "$REMOTE"
{{ end -}}
[http]
# proxy = http://host:port