X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_hgrc;h=359a30adaf24e0a01bbdadfa299c5a3a77e4b4b0;hb=3d19a710d2ff901c60b4b87e2ccc2f358fa8f91b;hp=c005bf2d3660ac5b200fdc833d3697de7a818349;hpb=6e42cfeef52937c47bc51988ad807e333969f2c7;p=sugar.git

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index c005bf2..359a30a 100644
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -1,36 +1,49 @@
 [defaults]
-pull = -u
 annotate = -n -l -u
+diff = --subrepos
 branches = -a
+commit = --subrepos
+in = --subrepos
+out = --subrepos
+pull = --rebase
+qseries = --summary
 revert = --no-backup
 
 [ui]
 username = PHO <pho@cielonegro.org>
 
+[web]
+cacerts = /etc/ssl/certs/ca-certificates.crt
+
 [diff]
 git = True
 
 [alias]
-egrep = !nohup egrep --color=always -n -e $1 `$HG manifest` | less -R --quit-if-one-screen
-fgrep = !nohup fgrep --color=always -n -e $1 `$HG manifest` | less -R --quit-if-one-screen
+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
+st    = !$HG __st `$HG root` --subrepos $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, grep, tags, qdiff
 
+[mq]
+git = auto
+
 [hooks]
 commit        = touch `hg root`/.hg/unpushed
 post-push     = rm -f `hg root`/.hg/unpushed