X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_hgrc;h=ffe893f33b05bb2d6314dccb99c6189672f283ba;hb=40e71dcd45c5a226dd52e1e0e582700d35c2854f;hp=3fc18c799cb07f8f195ba1926d986bb42c79f13d;hpb=e0d2ab7c80448fabab2f2895983bf08fe347b983;p=sugar.git

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index 3fc18c7..ffe893f 100644
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -1,28 +1,44 @@
 [defaults]
-pull = -u
+pull = --rebase
 annotate = -n -l -u
 branches = -a
+qseries = --summary
 revert = --no-backup
 
 [ui]
 username = PHO <pho@cielonegro.org>
 
+[web]
+cacerts = /usr/pkg/etc/openssl/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
+__st  = status
+st    = !$HG __st `$HG root` $HG_ARGS
+bm    = bookmark
+bms   = bookmarks
+
 [extensions]
 hgext.color=
 hgext.convert=
 hgext.fetch=
 hgext.graphlog=
-hgext.hgshelve=
 hgext.mq=
 hgext.pager=
+hgext.rebase=
 hgext.record=
 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