Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help/config.txt @ 27746:f0e9f38d250f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: prevent creating divergence Before this patch rebase would create divergence when you were rebasing obsolete changesets on a destination not containing one of its successors. This patch introduces rebase.allowdivergence to explicitly allow divergence creation with rebase.
author Laurent Charignon <lcharignon@fb.com>
date Tue, 12 Jan 2016 13:43:41 -0800
parents 6b639caa1652
children 6a63fd8dd486
line wrap: on
line diff
--- a/mercurial/help/config.txt	Wed Jan 06 12:55:56 2016 -0800
+++ b/mercurial/help/config.txt	Tue Jan 12 13:43:41 2016 -0800
@@ -1323,6 +1323,13 @@
 ``assume-tty``
     If true, ALWAYS show a progress bar, unless disable is given.
 
+``rebase``
+----------
+
+``allowdivergence``
+    Default to False, when True allow creating divergence when performing
+    rebase of obsolete changesets.
+
 ``revsetalias``
 ---------------