Mercurial > repos > other > linux

changeset 146:c67c56b569d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add the rebase extension to Mercurial It appears to be an "official" extension (https://www.mercurial-scm.org/wiki/RebaseExtension) and it lets us do "hg pull --rebase" to fix the "modified in two different places" problem without a merge
author IBBoard <dev@ibboard.co.uk>
date Sun, 23 Feb 2020 16:05:18 +0000
parents c1520aabcdd4
children 7718e4d9a019
files hgrc
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgrc	Sat Feb 15 13:30:56 2020 +0000
+++ b/hgrc	Sun Feb 23 16:05:18 2020 +0000
@@ -15,6 +15,7 @@
 copush = !$HG commit $@ && $HG push
 
 [extensions]
+rebase =
 extdiff =
 bookmarks =
 hgext.convert=