Mercurial > hg
diff hgext/rebase.py @ 9073:ec1cd3176625
rebase: wrapped docstrings at 78 characters
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 07 Jul 2009 23:54:42 +0200 |
parents | 1de6e7e1bb9f |
children | 07d127e771a1 |
line wrap: on
line diff
--- a/hgext/rebase.py Tue Jul 07 23:54:42 2009 +0200 +++ b/hgext/rebase.py Tue Jul 07 23:54:42 2009 +0200 @@ -7,8 +7,7 @@ '''command to move sets of revisions to a different ancestor -This extension lets you rebase changesets in an existing Mercurial -repository. +This extension lets you rebase changesets in an existing Mercurial repository. For more information: http://mercurial.selenic.com/wiki/RebaseProject @@ -42,9 +41,9 @@ def rebase(ui, repo, **opts): """move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of - history onto another. This can be useful for linearizing local - changes relative to a master development tree. + Rebase uses repeated merging to graft changesets from one part of history + onto another. This can be useful for linearizing local changes relative to + a master development tree. If a rebase is interrupted to manually resolve a merge, it can be continued with --continue/-c or aborted with --abort/-a.