Rebase draft (unpublished) changes over public changes.
--- a/hg.rst Tue Dec 30 13:52:03 2014 +0200
+++ b/hg.rst Tue Jan 06 21:19:13 2015 +0200
@@ -56,6 +56,13 @@
[defaults]
log = -f
+Show supported/loaded plugin.
+=============================
+::
+
+ $ hg help extensions
+ $ hg showconfig extensions
+
Useful extension.
=================
@@ -383,13 +390,6 @@
$ hg qpop -a
$ for patch in `hg qser`; do hg qrm $patch; done
-Show supported/loaded plugin.
-=============================
-::
-
- $ hg help extensions
- $ hg showconfig extensions
-
Proxy.
======
::
@@ -430,6 +430,17 @@
http://mercurial.selenic.com/wiki/TipsAndTricks#Merge_or_rebase_with_uncommitted_changes
http://mercurial.selenic.com/wiki/ShelveExtension
+Rebase.
+=======
+
+SVN like update::
+
+ $ hg pull --rebase
+
+Rebase draft (unpublished) changes over public changes::
+
+ $ hg rebase -s 'draft()' -d 'public()'
+
Find greatest common ancestor of changesets.
============================================
::