Auto commit by The Sugar System.

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index 606a93ebc60c68d4dae161b8f1397b4fa4f65548..96de54bbc01145f7d72c5287382eb51964486924 100644 (file)
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -1,7 +1,8 @@
 [defaults]
-pull = -u
+pull = --rebase
 annotate = -n -l -u
 branches = -a
+qseries = --summary
 revert = --no-backup
 
 [ui]
@@ -11,8 +12,8 @@ username = PHO <pho@cielonegro.org>
 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
@@ -22,15 +23,18 @@ 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