X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_hgrc;h=d622fe69e7f63cb8fbe8686a6541ae278271d490;hb=HEAD;hp=3c7576bbeda719ae7b5fb067cd97b618e053bc0b;hpb=95d6b5a02809e271c82a002b728ed785115167f6;p=sugar.git

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index 3c7576b..c22ba8d 100644
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -1,27 +1,54 @@
+# -*- conf -*-
+
 [defaults]
-pull = -u
 annotate = -n -l -u
+diff     = --subrepos
 branches = -a
-revert = --no-backup
+commit   = --subrepos
+in       = --subrepos
+out      = --subrepos
+pull     = --rebase
+qseries  = --summary
+revert   = --no-backup
+status   = --subrepos
 
 [ui]
 username = PHO <pho@cielonegro.org>
 
+[web]
+#cacerts = /etc/ssl/certs/ca-certificates.crt
+
 [diff]
 git = True
 
+[alias]
+egrep = !cd `$HG root`; nohup egrep --color=always -n -e '$1' `$HG manifest` | less -R --quit-if-one-screen
+fgrep = !cd `$HG root`; nohup fgrep --color=always -n -e '$1' `$HG manifest` | less -R --quit-if-one-screen
+stash = shelve
+qpst  = status --rev qparent:.
+qst   = status --rev '.^1:.'
+bm    = bookmark
+bms   = bookmarks
+
 [extensions]
 hgext.color=
+hgext.convert=
 hgext.fetch=
 hgext.graphlog=
-hgext.hgshelve=
+hgext.largefiles=
 hgext.mq=
 hgext.pager=
+hgext.purge=
+hgext.rebase=
 hgext.record=
+hgext.shelve=
 hgext.transplant=
 
 [pager]
-attend = annotate, cat, diff, export, glog, qdiff
+attend = annotate, cat, diff, export, glog, grep, tags, qdiff
+
+[mq]
+git = auto
 
 [hooks]
 commit        = touch `hg root`/.hg/unpushed