##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict...
rebase: teach in-memory rebase to not restart with on-disk rebase on conflict When in-memory rebase runs into conflicts, it redoes the whole rebase operation. This patch teaches it to instead discard just the current `overlayworkingctx` and redo that node on disk. I've tested this by enabling in-memory rebase by default and checking that there are no unexpected differences after this patch. The next step is to make it so that `hg rebase --continue` can use in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D9076
Matt Harbison - - Load All Authors

File last commit:

r44631:0ab651b5 stable
r46132:feffeb18 default
Show More
hgignore.5.txt
34 lines | 716 B | text/plain | TextLexer
/ mercurial / helptext / hgignore.5.txt
History | Source | Raw |Copy content |Copy permalink
Matt Harbison
help: create packages for the help text...
 r44031 ==========
hgignore
==========
---------------------------------
syntax for Mercurial ignore files
---------------------------------
:Author: Vadim Gelfer <vadim.gelfer@gmail.com>
:Organization: Mercurial
:Manual section: 5
:Manual group: Mercurial Manual
.. include:: hgignore.5.gendoc.txt
Author
======
Vadim Gelfer <vadim.gelfer@gmail.com>
Mercurial was written by Matt Mackall <mpm@selenic.com>.
See Also
========
|hg(1)|_, |hgrc(5)|_
Copying
=======
This manual page is copyright 2006 Vadim Gelfer.
Matt Harbison
copyright: update to 2020...
 r44631 Mercurial is copyright 2005-2020 Matt Mackall.
Matt Harbison
help: create packages for the help text...
 r44031 Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
.. include:: common.txt