Mercurial > hg
changeset 9271:4ea022359c43
rebase: wrap docstrings at 70 characters
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 26 Jul 2009 01:59:59 +0200 |
| parents | 00cc7fa0c0c6 |
| children | 784899697571 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Sun Jul 26 01:59:28 2009 +0200 +++ b/hgext/rebase.py Sun Jul 26 01:59:59 2009 +0200 @@ -7,7 +7,8 @@ '''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 @@ -41,9 +42,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.