121 lines
2.1 KiB
Plaintext
121 lines
2.1 KiB
Plaintext
|
[ui]
|
||
|
|
username = Dan Buch <daniel.buch@gmail.com>
|
||
|
|
debug = off
|
||
|
|
style = default
|
||
|
|
|
||
|
|
[pager]
|
||
|
|
pager = LESS='FSRX' less
|
||
|
|
quiet = true
|
||
|
|
attend = status, diff, log, glog, heads, branches, outgoing, incoming
|
||
|
|
|
||
|
|
[diff]
|
||
|
|
git = true
|
||
|
|
gui = false
|
||
|
|
|
||
|
|
[merge-patterns]
|
||
|
|
* = vimdiff
|
||
|
|
|
||
|
|
[merge-tools]
|
||
|
|
kdiff3.gui = false
|
||
|
|
gpyfm.gui = false
|
||
|
|
meld.gui = false
|
||
|
|
tkdiff.gui = false
|
||
|
|
xxdiff.gui = false
|
||
|
|
diffmerge.gui = false
|
||
|
|
p4merge.gui = false
|
||
|
|
ecmerge.gui = false
|
||
|
|
beyondcompare3.gui = false
|
||
|
|
|
||
|
|
vimdiff.executable = vimdiff
|
||
|
|
vimdiff.args = $local $other
|
||
|
|
vimdiff.priority = 1
|
||
|
|
|
||
|
|
[gpg]
|
||
|
|
key = 0x6DD3E3EC
|
||
|
|
|
||
|
|
[color]
|
||
|
|
# diff.diffline = bold
|
||
|
|
# diff.extended = cyan bold
|
||
|
|
# diff.file_a = red bold
|
||
|
|
# diff.file_b = green bold
|
||
|
|
# diff.hunk = magenta
|
||
|
|
# diff.deleted = red
|
||
|
|
# diff.inserted = green
|
||
|
|
# diff.changed = white
|
||
|
|
# diff.trailingwhitespace = bold red_background
|
||
|
|
# status.modified = magenta bold
|
||
|
|
# status.added = green bold
|
||
|
|
# status.removed = red bold
|
||
|
|
# status.deleted = cyan bold
|
||
|
|
# status.unknown = blue bold
|
||
|
|
# status.ignored = black bold
|
||
|
|
# qseries.applied = blue bold underline
|
||
|
|
# qseries.unapplied = black bold
|
||
|
|
# qseries.missing = red bold
|
||
|
|
|
||
|
|
# [merge-tools.diffmerge]
|
||
|
|
# gui = False
|
||
|
|
# checkchanged = True
|
||
|
|
|
||
|
|
# [merge-tools.filemerge]
|
||
|
|
# gui = False
|
||
|
|
|
||
|
|
# [merge-tools.gvimdiff]
|
||
|
|
# priority = -9
|
||
|
|
|
||
|
|
# [merge-tools.kdiff3]
|
||
|
|
# fixeol = True
|
||
|
|
# gui = False
|
||
|
|
|
||
|
|
# [merge-tools.merge]
|
||
|
|
# checkconflicts = True
|
||
|
|
# priority = -10
|
||
|
|
|
||
|
|
# [merge-tools.xxdiff]
|
||
|
|
# gui = False
|
||
|
|
# priority = -8
|
||
|
|
|
||
|
|
[extensions]
|
||
|
|
# hgext.acl =
|
||
|
|
hgext.bookmarks =
|
||
|
|
# hgext.bugzilla =
|
||
|
|
# hgext.children =
|
||
|
|
hgext.churn =
|
||
|
|
hgext.color =
|
||
|
|
hgext.convert =
|
||
|
|
# hgext.crecord =
|
||
|
|
# hgext.eol =
|
||
|
|
# hgext.extdiff =
|
||
|
|
# hgext.fetch =
|
||
|
|
# hgext.gpg =
|
||
|
|
hgext.graphlog =
|
||
|
|
# hgext.hgcia =
|
||
|
|
hgext.hgk =
|
||
|
|
# hgext.interhg =
|
||
|
|
# hgext.keyword =
|
||
|
|
# hgext.mq =
|
||
|
|
hgext.notify =
|
||
|
|
hgext.pager =
|
||
|
|
# hgext.parentrevspec =
|
||
|
|
# hgext.patchbomb =
|
||
|
|
hgext.progress =
|
||
|
|
hgext.purge =
|
||
|
|
hgext.rebase =
|
||
|
|
hgext.record =
|
||
|
|
# hgext.relink =
|
||
|
|
# hgext.schemes =
|
||
|
|
# hgext.share =
|
||
|
|
hgext.transplant =
|
||
|
|
# hgext.win32mbcs =
|
||
|
|
# hgext.win32text =
|
||
|
|
|
||
|
|
hgext.imerge = !
|
||
|
|
|
||
|
|
# hglocalbranch =
|
||
|
|
# hgshelve =
|
||
|
|
# hgsubversion =
|
||
|
|
# prompt = ~/repos/hg-prompt.hg/prompt.py
|
||
|
|
# activity = ~/repos/Hgactivity.hg/activity.py
|
||
|
|
|
||
|
|
# vim:filetype=cfg
|