Mercurial > repos > other > linux
view hgrc @ 146:c67c56b569d8
Add the rebase extension to Mercurial
It appears to be an "official" extension
(https://www.mercurial-scm.org/wiki/RebaseExtension)
and it lets us do "hg pull --rebase" to fix the "modified in two
different places" problem without a merge
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Sun, 23 Feb 2020 16:05:18 +0000 |
parents | ac6c055e7441 |
children | 961186621cc8 |
line wrap: on
line source
[ui] username = IBBoard <dev@ibboard.co.uk> merge = meld # git add -p, only MORE interactive! interface = curses %include ~/.hgrc-username-override [trusted] #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing) #If we don't trust root then we're screwed anyway! users = root [alias] copush = !$HG commit $@ && $HG push [extensions] rebase = extdiff = bookmarks = hgext.convert= color = pager = progress = mercurial_keyring = prompt = ~/.hg-prompt.py [extdiff] cmd.meld = meld # Image diffing cmd.imdiff = sh opts.imdiff = -c 'compare $0 $1 compared.png; display compared.png' [pager] pager = LESS='FSRX' less ignore = version, help, update, serve, record %include ~/.hgrc-certs %include ~/.hgrc-auth